From 98ab8a579ba5cf5489a491d63495bf7668027c58 Mon Sep 17 00:00:00 2001
From: renovate <renovate@hhhhh.dev>
Date: Sat, 10 Oct 2026 00:31:31 +0000
Subject: [PATCH] chore(infra): update template to v0.6.0, conflicts left

---
 .copier/infra.yml |  2 +-
 .gitignore        |  2 +-
 Makefile          |  8 ++------
 README.md         | 10 ++++++++++
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.copier/infra.yml b/.copier/infra.yml
index ac0d644..16c8b8d 100644
--- a/.copier/infra.yml
+++ b/.copier/infra.yml
@@ -1,4 +1,4 @@
-_commit: v0.5.0
+_commit: v0.6.0
 _src_path: https://git.kotikot.com/templates/infra.git
 init_git: false
 layout: parts
diff --git a/.gitignore b/.gitignore
index ddf137d..b6ba220 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,4 @@ docs
 storage
 
 # Local playground
-t/
+/t/
diff --git a/Makefile b/Makefile
index 6dd3380..07ff450 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 PARTS := $(patsubst %/Makefile,%,$(wildcard */Makefile))
 
-.PHONY: env recreate rebuild restart logs down deploy fmt check build pre-deploy post-deploy
+.PHONY: env recreate rebuild restart logs down fmt check build
 
 env:
 	@fresh=; test -f .env || { awk 'FNR == 1 && NR > 1 { print "" } 1' .env.example $(addsuffix /.env.example,$(PARTS)) > .env; fresh=1; }; \
@@ -30,9 +30,5 @@ logs:
 down:
 	docker compose down
 
-deploy: pre-deploy
-	docker compose up -d
-	$(MAKE) post-deploy
-
-fmt check build pre-deploy post-deploy:
+fmt check build:
 	@for part in $(PARTS); do $(MAKE) -C $$part $@ || exit 1; done
diff --git a/README.md b/README.md
index 83cacb1..5db79f1 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,7 @@
 
 A read-only Telegram client that keeps everything. A userbot on your own account logs every incoming message into Postgres, including the ones later deleted or edited, along with media, reactions, presence and stories. A web client reads that archive back, and an MCP server hands it to agents.
 
+<<<<<<< before updating
 Useful on its own: a Telegram where nothing disappears. In the [beaver](https://git.kotikot.com/beaver) setup it is one of the agent's hands - the dispatcher reads chat history by the `chat_id` stored in a person's card.
 
 ## What it keeps
@@ -43,3 +44,12 @@ make fmt
 make check
 make -C frontend dev
 ```
+=======
+```sh
+make env       # .env and docker-compose.override.yml from the examples
+make recreate  # the services in COMPOSE_PROFILES
+make check
+```
+
+Parts: `backend/`, `frontend/`, each with its own Makefile.
+>>>>>>> after updating