Merge: fix agents/claw_agents table collision with n8n core Agents (#35)

Verified live on the n8n-claw instance: 009 rename applied, claw_agents holds
19 app rows, public.agents is now n8n's core table (projectId, 0 rows),
agent execution 136652 loaded config from claw_agents successfully.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

Author: freddy-schuetz

README.md

@@ -1333,6 +1333,15 @@ docker compose up -d
 
 </summary>
 
+**n8n won't start after `docker compose pull` (logs show `column "projectId" does not exist` / `CreateAgentTables1783000000000`)?**
+→ n8n 2.21.4 and newer ship a built-in *Agents* feature that creates its own `agents` table. Older n8n-claw installs already had an app table named `agents` in the same database, so n8n's migration collides and the instance crash-loops on boot. Your data is safe (the failed migration rolls back cleanly). The fix renames the app table to `claw_agents`, freeing the name for n8n:
+
+```bash
+cd n8n-claw && git pull && ./setup.sh --force
+```
+
+This applies migration `009_agents_rename.sql` (renames the table, keeping all your personas and tool config), lets n8n boot, and re-imports the workflows so they point at `claw_agents`. No version pin needed: you can stay on current n8n.
+
 **Agent not responding to Telegram messages?**
 → Check all workflows are **activated** in n8n UI
 

setup.sh

@@ -680,6 +680,20 @@ if [ -n "$FITNESS_ERRORS" ]; then
 fi
 echo "  ✅ Fitness Buddy schema applied"
 
+# Rename app table agents -> claw_agents (Issue #35: avoids collision with
+# n8n >= 2.21.4 core Agents feature). Idempotent: only renames n8n-claw's
+# table (identified by its `key` column) and only if not already renamed.
+# Must run before n8n migrates so it can create its own public.agents.
+echo "  Applying agents->claw_agents rename migration..."
+RENAME_OUTPUT=$(LANG=C LC_ALL=C PGPASSWORD=$POSTGRES_PASSWORD psql -h localhost -U postgres -d postgres \
+  -f supabase/migrations/009_agents_rename.sql 2>&1)
+RENAME_ERRORS=$(echo "$RENAME_OUTPUT" | grep -i "error" | head -5)
+if [ -n "$RENAME_ERRORS" ]; then
+  echo -e "  ${YELLOW}⚠️  Rename migration warnings:${NC}"
+  echo "$RENAME_ERRORS" | while read line; do echo "    $line"; done
+fi
+echo "  ✅ agents->claw_agents rename applied"
+
 # Reload PostgREST schema cache so new tables are immediately available via API
 docker kill --signal=SIGUSR1 $(docker ps -q --filter name=rest) 2>/dev/null || true
 
@@ -2296,7 +2310,7 @@ user = '${USER_DISPLAY}'.replace("'", "''")
 ctx = '${CTX}'.replace("'", "''")
 
 sql = f"""
-INSERT INTO public.agents (key, content) VALUES
+INSERT INTO public.claw_agents (key, content) VALUES
   ('mcp_instructions', 'You have MCP Skills — installable capabilities powered by the Model Context Protocol (MCP):
 
 ## MCP Client (mcp_client tool)
@@ -2760,7 +2774,7 @@ pw = os.environ.get('POSTGRES_PASSWORD', '')
 env = {**os.environ, 'PGPASSWORD': pw, 'LANG': 'C', 'LC_ALL': 'C'}
 
 sql = """
-INSERT INTO public.agents (key, content) VALUES
+INSERT INTO public.claw_agents (key, content) VALUES
   ('persona:research-expert', '# Research Expert
 
 ## Expertise

supabase/migrations/001_schema.sql

@@ -121,24 +121,27 @@ SET default_tablespace = '';
 SET default_table_access_method = heap;
 
 --
--- Name: agents; Type: TABLE; Schema: public; Owner: postgres
+-- Name: claw_agents; Type: TABLE; Schema: public; Owner: postgres
+--
+-- Renamed from `agents` (Issue #35): n8n >= 2.21.4 ships a core
+-- "Agents" feature that creates its own public.agents table.
 --
 
-CREATE TABLE public.agents (
+CREATE TABLE public.claw_agents (
     id integer NOT NULL,
     key text NOT NULL,
     content text NOT NULL,
     updated_at timestamp with time zone DEFAULT now()
 );
 
 
-ALTER TABLE public.agents OWNER TO postgres;
+ALTER TABLE public.claw_agents OWNER TO postgres;
 
 --
--- Name: agents_id_seq; Type: SEQUENCE; Schema: public; Owner: postgres
+-- Name: claw_agents_id_seq; Type: SEQUENCE; Schema: public; Owner: postgres
 --
 
-CREATE SEQUENCE public.agents_id_seq
+CREATE SEQUENCE public.claw_agents_id_seq
     AS integer
     START WITH 1
     INCREMENT BY 1
@@ -147,13 +150,13 @@ CREATE SEQUENCE public.agents_id_seq
     CACHE 1;
 
 
-ALTER TABLE public.agents_id_seq OWNER TO postgres;
+ALTER TABLE public.claw_agents_id_seq OWNER TO postgres;
 
 --
--- Name: agents_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: postgres
+-- Name: claw_agents_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: postgres
 --
 
-ALTER SEQUENCE public.agents_id_seq OWNED BY public.agents.id;
+ALTER SEQUENCE public.claw_agents_id_seq OWNED BY public.claw_agents.id;
 
 
 --
@@ -548,10 +551,10 @@ ALTER SEQUENCE public.reminders_id_seq OWNED BY public.reminders.id;
 
 
 --
--- Name: agents id; Type: DEFAULT; Schema: public; Owner: postgres
+-- Name: claw_agents id; Type: DEFAULT; Schema: public; Owner: postgres
 --
 
-ALTER TABLE ONLY public.agents ALTER COLUMN id SET DEFAULT nextval('public.agents_id_seq'::regclass);
+ALTER TABLE ONLY public.claw_agents ALTER COLUMN id SET DEFAULT nextval('public.claw_agents_id_seq'::regclass);
 
 
 --
@@ -625,19 +628,19 @@ ALTER TABLE ONLY public.reminders ALTER COLUMN id SET DEFAULT nextval('public.re
 
 
 --
--- Name: agents agents_key_key; Type: CONSTRAINT; Schema: public; Owner: postgres
+-- Name: claw_agents claw_agents_key_key; Type: CONSTRAINT; Schema: public; Owner: postgres
 --
 
-ALTER TABLE ONLY public.agents
-    ADD CONSTRAINT agents_key_key UNIQUE (key);
+ALTER TABLE ONLY public.claw_agents
+    ADD CONSTRAINT claw_agents_key_key UNIQUE (key);
 
 
 --
--- Name: agents agents_pkey; Type: CONSTRAINT; Schema: public; Owner: postgres
+-- Name: claw_agents claw_agents_pkey; Type: CONSTRAINT; Schema: public; Owner: postgres
 --
 
-ALTER TABLE ONLY public.agents
-    ADD CONSTRAINT agents_pkey PRIMARY KEY (id);
+ALTER TABLE ONLY public.claw_agents
+    ADD CONSTRAINT claw_agents_pkey PRIMARY KEY (id);
 
 
 --
@@ -903,12 +906,12 @@ GRANT ALL ON FUNCTION public.search_memory_keyword(search_query text, match_coun
 
 
 --
--- Name: TABLE agents; Type: ACL; Schema: public; Owner: postgres
+-- Name: TABLE claw_agents; Type: ACL; Schema: public; Owner: postgres
 --
 
-GRANT ALL ON TABLE public.agents TO anon;
-GRANT ALL ON TABLE public.agents TO authenticated;
-GRANT ALL ON TABLE public.agents TO service_role;
+GRANT ALL ON TABLE public.claw_agents TO anon;
+GRANT ALL ON TABLE public.claw_agents TO authenticated;
+GRANT ALL ON TABLE public.claw_agents TO service_role;
 
 
 --
@@ -921,12 +924,12 @@ GRANT ALL ON TABLE public.file_refs TO service_role;
 
 
 --
--- Name: SEQUENCE agents_id_seq; Type: ACL; Schema: public; Owner: postgres
+-- Name: SEQUENCE claw_agents_id_seq; Type: ACL; Schema: public; Owner: postgres
 --
 
-GRANT ALL ON SEQUENCE public.agents_id_seq TO anon;
-GRANT ALL ON SEQUENCE public.agents_id_seq TO authenticated;
-GRANT ALL ON SEQUENCE public.agents_id_seq TO service_role;
+GRANT ALL ON SEQUENCE public.claw_agents_id_seq TO anon;
+GRANT ALL ON SEQUENCE public.claw_agents_id_seq TO authenticated;
+GRANT ALL ON SEQUENCE public.claw_agents_id_seq TO service_role;
 
 
 --

supabase/migrations/002_seed.sql

@@ -11,8 +11,8 @@ INSERT INTO public.soul (key, content) VALUES
   ('communication', 'Du kommunizierst mit dem User über Telegram. Die Chat-ID ist in der Nachricht enthalten. Du KANNST dem User direkt antworten – deine Antwort wird automatisch als Telegram-Nachricht gesendet. Du brauchst keinen extra Kanal.')
 ON CONFLICT (key) DO UPDATE SET content = EXCLUDED.content;
 
--- Agents: Tool instructions & config
-INSERT INTO public.agents (key, content) VALUES
+-- Agents: Tool instructions & config (table renamed agents -> claw_agents, Issue #35)
+INSERT INTO public.claw_agents (key, content) VALUES
   ('mcp_instructions', 'Du hast MCP (Model Context Protocol) Fähigkeiten:
 
 ## MCP Client (mcp_client tool)
@@ -42,7 +42,7 @@ ON CONFLICT (path) DO UPDATE SET active = true;
 
 -- Expert Agent Personas (default agents shipped with setup.sh)
 -- These are also seeded by setup.sh — this SQL serves as reference/backup
-INSERT INTO public.agents (key, content) VALUES
+INSERT INTO public.claw_agents (key, content) VALUES
   ('persona:research-expert', '# Research Expert
 
 ## Expertise

supabase/migrations/009_agents_rename.sql

@@ -0,0 +1,57 @@
+-- ============================================================
+-- 009_agents_rename.sql — rename app table agents -> claw_agents
+-- ============================================================
+-- Fixes Issue #35: n8n >= 2.21.4 ships a core "Agents" feature whose
+-- migration CreateAgentTables1783000000000 creates a table named
+-- `agents` and indexes its `projectId` column. n8n-claw already owns
+-- `public.agents` (persona/config table) in the SAME database, so
+-- n8n's createTable no-ops, the createIndex on projectId fails, and
+-- n8n never boots.
+--
+-- Fix: move the n8n-claw data to `claw_agents`, freeing the `agents`
+-- name for n8n's own table.
+--
+-- Data-preserving, idempotent, and safe by design:
+--   * Only ever touches a public.agents table that has a `key` column.
+--     That uniquely identifies n8n-claw's table and NEVER matches
+--     n8n's core `agents` (which has no `key`). If n8n already created
+--     its own `agents`, the whole block is a no-op.
+--   * Two paths, because 001_schema.sql (which creates `claw_agents`)
+--     runs BEFORE this migration in setup.sh:
+--       - claw_agents does NOT exist yet  -> plain RENAME (carries data).
+--       - claw_agents already exists (empty shell created by 001 on an
+--         upgrade) -> copy the legacy rows over, then DROP the legacy
+--         table to free the `agents` name.
+--   * Re-runs are no-ops once the legacy table is gone.
+-- ============================================================
+
+DO $$
+BEGIN
+  -- Act only if the LEGACY n8n-claw table (identified by `key`) still
+  -- exists under the old name `agents`.
+  IF EXISTS (
+        SELECT 1 FROM information_schema.columns
+        WHERE table_schema = 'public'
+          AND table_name   = 'agents'
+          AND column_name  = 'key'
+     )
+  THEN
+    IF NOT EXISTS (
+          SELECT 1 FROM information_schema.tables
+          WHERE table_schema = 'public'
+            AND table_name   = 'claw_agents'
+       )
+    THEN
+      -- claw_agents does not exist yet: rename in place (keeps all data).
+      ALTER TABLE public.agents RENAME TO claw_agents;
+      ALTER SEQUENCE IF EXISTS public.agents_id_seq RENAME TO claw_agents_id_seq;
+    ELSE
+      -- claw_agents already exists (created empty by 001 on an upgrade):
+      -- move legacy rows over, then drop the legacy table to free `agents`.
+      INSERT INTO public.claw_agents (key, content, updated_at)
+        SELECT key, content, updated_at FROM public.agents
+        ON CONFLICT (key) DO NOTHING;
+      DROP TABLE public.agents;
+    END IF;
+  END IF;
+END $$;

workflows/agent-library-manager.json

@@ -568,7 +568,7 @@
     {
       "parameters": {
         "method": "PATCH",
-        "url": "{{SUPABASE_URL}}/rest/v1/agents?key=eq.mcp_instructions",
+        "url": "{{SUPABASE_URL}}/rest/v1/claw_agents?key=eq.mcp_instructions",
         "sendHeaders": true,
         "headerParameters": {
           "parameters": [

workflows/mcp-builder.json

@@ -1119,7 +1119,7 @@
     {
       "parameters": {
         "operation": "executeQuery",
-        "query": "SELECT key, content FROM agents WHERE key NOT LIKE 'persona:%' ORDER BY key",
+        "query": "SELECT key, content FROM claw_agents WHERE key NOT LIKE 'persona:%' ORDER BY key",
         "options": {
           "queryBatching": "independently"
         }

workflows/mcp-library-manager.json

@@ -155,7 +155,7 @@
       ],
       "parameters": {
         "operation": "executeQuery",
-        "query": "SELECT content FROM agents WHERE key = 'persona:' || '{{ $json.agent }}' LIMIT 1",
+        "query": "SELECT content FROM claw_agents WHERE key = 'persona:' || '{{ $json.agent }}' LIMIT 1",
         "options": {
           "queryBatching": "independently"
         }