agor-live 0.17.2 → 0.17.3

package/dist/core/db/session-guard.d.cts

@@ -1,14 +1,14 @@
 import '../id-CoIbY_uc.cjs';
-export { i as isForeignKeyConstraintError, w as withSessionGuard } from '../session-guard-kvAx_8Fb.cjs';
+export { i as isForeignKeyConstraintError, w as withSessionGuard } from '../session-guard-KHh0cnET.cjs';
 import '../session-MNU4BQv4.cjs';
 import '../agentic-tool-BulhIUGb.cjs';
 import '../context-BpkCELpO.cjs';
-import '../client-B5PyIvNc.cjs';
+import '../client-CemqXk0v.cjs';
 import 'drizzle-orm/libsql';
 import 'drizzle-orm/postgres-js';
 import 'drizzle-orm';
-import '../message-DinITA7a.cjs';
+import '../message-CSWOsdcZ.cjs';
 import '../board-D7SnPqp-.cjs';
-import '../task-wht1RJEL.cjs';
+import '../task-C2Hy7H6u.cjs';
 import 'drizzle-orm/pg-core';
 import 'drizzle-orm/sqlite-core';

package/dist/core/db/session-guard.d.ts

@@ -1,14 +1,14 @@
 import '../id-CoIbY_uc.js';
-export { i as isForeignKeyConstraintError, w as withSessionGuard } from '../session-guard-C0LkDEN7.js';
+export { i as isForeignKeyConstraintError, w as withSessionGuard } from '../session-guard-BFqVtBoS.js';
 import '../session-CAfhv1qL.js';
 import '../agentic-tool-cYqsU5i5.js';
 import '../context-BpkCELpO.js';
-import '../client-C1CsRi19.js';
+import '../client-uYEOha6g.js';
 import 'drizzle-orm/libsql';
 import 'drizzle-orm/postgres-js';
 import 'drizzle-orm';
-import '../message-CHUUP6OS.js';
+import '../message-DZa8g0s0.js';
 import '../board-D3YJ0_ih.js';
-import '../task-BLPFCORT.js';
+import '../task-BHV-YHg1.js';
 import 'drizzle-orm/pg-core';
 import 'drizzle-orm/sqlite-core';

package/dist/core/drizzle/postgres/0028_queued_tasks.sql

@@ -0,0 +1,8 @@
+-- Task-centric queue refactor (Section C of never-lose-prompt design) — part 1
+--
+-- Mirror of sqlite/0039_queued_tasks.sql. Additive: introduces
+-- tasks.queue_position + tasks_queue_idx. Backfill + messages-column drop
+-- ships in 0029 alongside the code refactor.
+
+ALTER TABLE "tasks" ADD COLUMN IF NOT EXISTS "queue_position" integer;--> statement-breakpoint
+CREATE INDEX IF NOT EXISTS "tasks_queue_idx" ON "tasks" ("session_id", "status", "queue_position");

package/dist/core/drizzle/postgres/0030_migrate_queued_messages.sql

@@ -0,0 +1,24 @@
+-- Task-centric queue refactor (Section C of never-lose-prompt design) — part 2
+--
+-- Mirror of sqlite/0040_migrate_queued_messages.sql. Drops the legacy
+-- message-level queue without backfilling: any prompts queued at daemon
+-- restart can be re-issued by the caller, so we do not preserve them.
+--
+-- Belt-and-suspenders: a partial unique index on
+-- (session_id, queue_position) WHERE status='queued' guards the new
+-- `tasks.createPending` race fix at the storage layer.
+
+-- 1. Drop legacy queued message rows.
+DELETE FROM "messages" WHERE "status" = 'queued';
+--> statement-breakpoint
+
+-- 2. Drop messages.status / messages.queue_position + their composite index.
+DROP INDEX IF EXISTS "messages_queue_idx";--> statement-breakpoint
+ALTER TABLE "messages" DROP COLUMN IF EXISTS "status";--> statement-breakpoint
+ALTER TABLE "messages" DROP COLUMN IF EXISTS "queue_position";--> statement-breakpoint
+
+-- 3. Partial unique index — defense-in-depth for `tasks.createPending` race
+--    serialization.
+CREATE UNIQUE INDEX IF NOT EXISTS "tasks_queued_position_unique"
+  ON "tasks" ("session_id", "queue_position")
+  WHERE "status" = 'queued';

package/dist/core/drizzle/postgres/0031_restructure_agentic_tool_config.sql

@@ -0,0 +1,201 @@
+-- Restructure per-tool credentials into per-tool buckets.
+--
+-- Lifts encrypted credential strings from two legacy locations:
+--   1. data.api_keys.<FIELD>                      (flat map, current PR's intermediate shape)
+--   2. data.env_vars.<FIELD>                      (legacy plaintext form: string)
+--   3. data.env_vars.<FIELD>.value_encrypted      (v0.5 object form)
+--
+-- ...into the new per-tool structure:
+--   data.agentic_tools.<tool>.<FIELD>             (encrypted string, uniform shape)
+--
+-- Source priority is api_keys > env_vars (api_keys is more recently/explicitly set).
+-- All values stay encrypted at rest — the runtime decrypts on read; URL-typed
+-- fields are still stored as encrypted blobs for shape uniformity.
+--
+-- Idempotency: per-field lift is skipped if the target is already populated.
+-- Non-destructive: source rows are only removed AFTER the target is verified
+-- populated, so a partial run can be safely retried.
+
+-- ============================================================
+-- Lift step: agentic_tools.<tool>.<FIELD> ← api_keys/env_vars
+-- ============================================================
+
+-- claude-code: ANTHROPIC_API_KEY
+UPDATE users SET data = jsonb_set(
+  data,
+  '{agentic_tools,claude-code,ANTHROPIC_API_KEY}',
+  COALESCE(
+    data->'api_keys'->'ANTHROPIC_API_KEY',
+    CASE jsonb_typeof(data->'env_vars'->'ANTHROPIC_API_KEY')
+      WHEN 'string' THEN data->'env_vars'->'ANTHROPIC_API_KEY'
+      WHEN 'object' THEN data->'env_vars'->'ANTHROPIC_API_KEY'->'value_encrypted'
+    END
+  ),
+  true
+)
+WHERE NOT (COALESCE(data->'agentic_tools'->'claude-code', '{}'::jsonb) ? 'ANTHROPIC_API_KEY')
+  AND COALESCE(
+    data->'api_keys'->'ANTHROPIC_API_KEY',
+    CASE jsonb_typeof(data->'env_vars'->'ANTHROPIC_API_KEY')
+      WHEN 'string' THEN data->'env_vars'->'ANTHROPIC_API_KEY'
+      WHEN 'object' THEN data->'env_vars'->'ANTHROPIC_API_KEY'->'value_encrypted'
+    END
+  ) IS NOT NULL;
+
+-- claude-code: CLAUDE_CODE_OAUTH_TOKEN
+UPDATE users SET data = jsonb_set(
+  data,
+  '{agentic_tools,claude-code,CLAUDE_CODE_OAUTH_TOKEN}',
+  COALESCE(
+    data->'api_keys'->'CLAUDE_CODE_OAUTH_TOKEN',
+    CASE jsonb_typeof(data->'env_vars'->'CLAUDE_CODE_OAUTH_TOKEN')
+      WHEN 'string' THEN data->'env_vars'->'CLAUDE_CODE_OAUTH_TOKEN'
+      WHEN 'object' THEN data->'env_vars'->'CLAUDE_CODE_OAUTH_TOKEN'->'value_encrypted'
+    END
+  ),
+  true
+)
+WHERE NOT (COALESCE(data->'agentic_tools'->'claude-code', '{}'::jsonb) ? 'CLAUDE_CODE_OAUTH_TOKEN')
+  AND COALESCE(
+    data->'api_keys'->'CLAUDE_CODE_OAUTH_TOKEN',
+    CASE jsonb_typeof(data->'env_vars'->'CLAUDE_CODE_OAUTH_TOKEN')
+      WHEN 'string' THEN data->'env_vars'->'CLAUDE_CODE_OAUTH_TOKEN'
+      WHEN 'object' THEN data->'env_vars'->'CLAUDE_CODE_OAUTH_TOKEN'->'value_encrypted'
+    END
+  ) IS NOT NULL;
+
+-- claude-code: ANTHROPIC_BASE_URL  (env_vars only — was never in api_keys)
+UPDATE users SET data = jsonb_set(
+  data,
+  '{agentic_tools,claude-code,ANTHROPIC_BASE_URL}',
+  CASE jsonb_typeof(data->'env_vars'->'ANTHROPIC_BASE_URL')
+    WHEN 'string' THEN data->'env_vars'->'ANTHROPIC_BASE_URL'
+    WHEN 'object' THEN data->'env_vars'->'ANTHROPIC_BASE_URL'->'value_encrypted'
+  END,
+  true
+)
+WHERE NOT (COALESCE(data->'agentic_tools'->'claude-code', '{}'::jsonb) ? 'ANTHROPIC_BASE_URL')
+  AND CASE jsonb_typeof(data->'env_vars'->'ANTHROPIC_BASE_URL')
+        WHEN 'string' THEN data->'env_vars'->'ANTHROPIC_BASE_URL'
+        WHEN 'object' THEN data->'env_vars'->'ANTHROPIC_BASE_URL'->'value_encrypted'
+        ELSE NULL
+      END IS NOT NULL;
+
+-- claude-code: ANTHROPIC_AUTH_TOKEN  (env_vars only)
+UPDATE users SET data = jsonb_set(
+  data,
+  '{agentic_tools,claude-code,ANTHROPIC_AUTH_TOKEN}',
+  CASE jsonb_typeof(data->'env_vars'->'ANTHROPIC_AUTH_TOKEN')
+    WHEN 'string' THEN data->'env_vars'->'ANTHROPIC_AUTH_TOKEN'
+    WHEN 'object' THEN data->'env_vars'->'ANTHROPIC_AUTH_TOKEN'->'value_encrypted'
+  END,
+  true
+)
+WHERE NOT (COALESCE(data->'agentic_tools'->'claude-code', '{}'::jsonb) ? 'ANTHROPIC_AUTH_TOKEN')
+  AND CASE jsonb_typeof(data->'env_vars'->'ANTHROPIC_AUTH_TOKEN')
+        WHEN 'string' THEN data->'env_vars'->'ANTHROPIC_AUTH_TOKEN'
+        WHEN 'object' THEN data->'env_vars'->'ANTHROPIC_AUTH_TOKEN'->'value_encrypted'
+        ELSE NULL
+      END IS NOT NULL;
+
+-- codex: OPENAI_API_KEY
+UPDATE users SET data = jsonb_set(
+  data,
+  '{agentic_tools,codex,OPENAI_API_KEY}',
+  COALESCE(
+    data->'api_keys'->'OPENAI_API_KEY',
+    CASE jsonb_typeof(data->'env_vars'->'OPENAI_API_KEY')
+      WHEN 'string' THEN data->'env_vars'->'OPENAI_API_KEY'
+      WHEN 'object' THEN data->'env_vars'->'OPENAI_API_KEY'->'value_encrypted'
+    END
+  ),
+  true
+)
+WHERE NOT (COALESCE(data->'agentic_tools'->'codex', '{}'::jsonb) ? 'OPENAI_API_KEY')
+  AND COALESCE(
+    data->'api_keys'->'OPENAI_API_KEY',
+    CASE jsonb_typeof(data->'env_vars'->'OPENAI_API_KEY')
+      WHEN 'string' THEN data->'env_vars'->'OPENAI_API_KEY'
+      WHEN 'object' THEN data->'env_vars'->'OPENAI_API_KEY'->'value_encrypted'
+    END
+  ) IS NOT NULL;
+
+-- gemini: GEMINI_API_KEY
+UPDATE users SET data = jsonb_set(
+  data,
+  '{agentic_tools,gemini,GEMINI_API_KEY}',
+  COALESCE(
+    data->'api_keys'->'GEMINI_API_KEY',
+    CASE jsonb_typeof(data->'env_vars'->'GEMINI_API_KEY')
+      WHEN 'string' THEN data->'env_vars'->'GEMINI_API_KEY'
+      WHEN 'object' THEN data->'env_vars'->'GEMINI_API_KEY'->'value_encrypted'
+    END
+  ),
+  true
+)
+WHERE NOT (COALESCE(data->'agentic_tools'->'gemini', '{}'::jsonb) ? 'GEMINI_API_KEY')
+  AND COALESCE(
+    data->'api_keys'->'GEMINI_API_KEY',
+    CASE jsonb_typeof(data->'env_vars'->'GEMINI_API_KEY')
+      WHEN 'string' THEN data->'env_vars'->'GEMINI_API_KEY'
+      WHEN 'object' THEN data->'env_vars'->'GEMINI_API_KEY'->'value_encrypted'
+    END
+  ) IS NOT NULL;
+
+-- copilot: COPILOT_GITHUB_TOKEN
+-- (Note: GH_TOKEN / GITHUB_TOKEN are intentionally NOT migrated — they have
+--  legitimate non-Copilot uses (git, gh CLI). The Copilot SDK's own fallback
+--  chain still picks them up at runtime if no per-tool token is set.)
+UPDATE users SET data = jsonb_set(
+  data,
+  '{agentic_tools,copilot,COPILOT_GITHUB_TOKEN}',
+  COALESCE(
+    data->'api_keys'->'COPILOT_GITHUB_TOKEN',
+    CASE jsonb_typeof(data->'env_vars'->'COPILOT_GITHUB_TOKEN')
+      WHEN 'string' THEN data->'env_vars'->'COPILOT_GITHUB_TOKEN'
+      WHEN 'object' THEN data->'env_vars'->'COPILOT_GITHUB_TOKEN'->'value_encrypted'
+    END
+  ),
+  true
+)
+WHERE NOT (COALESCE(data->'agentic_tools'->'copilot', '{}'::jsonb) ? 'COPILOT_GITHUB_TOKEN')
+  AND COALESCE(
+    data->'api_keys'->'COPILOT_GITHUB_TOKEN',
+    CASE jsonb_typeof(data->'env_vars'->'COPILOT_GITHUB_TOKEN')
+      WHEN 'string' THEN data->'env_vars'->'COPILOT_GITHUB_TOKEN'
+      WHEN 'object' THEN data->'env_vars'->'COPILOT_GITHUB_TOKEN'->'value_encrypted'
+    END
+  ) IS NOT NULL;
+
+-- ============================================================
+-- Cleanup: remove now-redundant source entries.
+-- Each runs only if the corresponding target is verifiably populated.
+-- ============================================================
+
+-- claude-code: ANTHROPIC_API_KEY
+UPDATE users SET data = (data #- '{api_keys,ANTHROPIC_API_KEY}') #- '{env_vars,ANTHROPIC_API_KEY}'
+WHERE data->'agentic_tools'->'claude-code'->'ANTHROPIC_API_KEY' IS NOT NULL;
+
+-- claude-code: CLAUDE_CODE_OAUTH_TOKEN
+UPDATE users SET data = (data #- '{api_keys,CLAUDE_CODE_OAUTH_TOKEN}') #- '{env_vars,CLAUDE_CODE_OAUTH_TOKEN}'
+WHERE data->'agentic_tools'->'claude-code'->'CLAUDE_CODE_OAUTH_TOKEN' IS NOT NULL;
+
+-- claude-code: ANTHROPIC_BASE_URL
+UPDATE users SET data = data #- '{env_vars,ANTHROPIC_BASE_URL}'
+WHERE data->'agentic_tools'->'claude-code'->'ANTHROPIC_BASE_URL' IS NOT NULL;
+
+-- claude-code: ANTHROPIC_AUTH_TOKEN
+UPDATE users SET data = data #- '{env_vars,ANTHROPIC_AUTH_TOKEN}'
+WHERE data->'agentic_tools'->'claude-code'->'ANTHROPIC_AUTH_TOKEN' IS NOT NULL;
+
+-- codex: OPENAI_API_KEY
+UPDATE users SET data = (data #- '{api_keys,OPENAI_API_KEY}') #- '{env_vars,OPENAI_API_KEY}'
+WHERE data->'agentic_tools'->'codex'->'OPENAI_API_KEY' IS NOT NULL;
+
+-- gemini: GEMINI_API_KEY
+UPDATE users SET data = (data #- '{api_keys,GEMINI_API_KEY}') #- '{env_vars,GEMINI_API_KEY}'
+WHERE data->'agentic_tools'->'gemini'->'GEMINI_API_KEY' IS NOT NULL;
+
+-- copilot: COPILOT_GITHUB_TOKEN
+UPDATE users SET data = (data #- '{api_keys,COPILOT_GITHUB_TOKEN}') #- '{env_vars,COPILOT_GITHUB_TOKEN}'
+WHERE data->'agentic_tools'->'copilot'->'COPILOT_GITHUB_TOKEN' IS NOT NULL;

package/dist/core/drizzle/postgres/meta/_journal.json

@@ -197,6 +197,27 @@
       "when": 1777000000000,
       "tag": "0027_mcp_oauth_token_refresh",
       "breakpoints": true
+    },
+    {
+      "idx": 28,
+      "version": "7",
+      "when": 1777200000000,
+      "tag": "0028_queued_tasks",
+      "breakpoints": true
+    },
+    {
+      "idx": 29,
+      "version": "7",
+      "when": 1777200100000,
+      "tag": "0030_migrate_queued_messages",
+      "breakpoints": true
+    },
+    {
+      "idx": 30,
+      "version": "7",
+      "when": 1777300000000,
+      "tag": "0031_restructure_agentic_tool_config",
+      "breakpoints": true
     }
   ]
 }

package/dist/core/drizzle/sqlite/0039_queued_tasks.sql

@@ -0,0 +1,13 @@
+-- Task-centric queue refactor (Section C of never-lose-prompt design) — part 1
+--
+-- Additive migration: introduces queue_position on tasks. The status enum
+-- gains a 'queued' value at the application layer (tasks.status is `text NOT
+-- NULL` with no DB-level CHECK).
+--
+-- The follow-up migration (0040) backfills queued *messages* into queued
+-- *tasks* and drops `messages.status` / `messages.queue_position` once the
+-- code base no longer reads them. Splitting it lets each migration be safely
+-- deployable in isolation.
+
+ALTER TABLE `tasks` ADD `queue_position` integer;--> statement-breakpoint
+CREATE INDEX `tasks_queue_idx` ON `tasks` (`session_id`,`status`,`queue_position`);

package/dist/core/drizzle/sqlite/0040_migrate_queued_messages.sql

@@ -0,0 +1,61 @@
+-- Task-centric queue refactor (Section C of never-lose-prompt design) — part 2
+--
+-- Drops the legacy message-level queue (`messages.status='queued'`,
+-- `messages.queue_position`). Queued rows are simply discarded — preserving
+-- them across the upgrade is not a goal: any prompts queued at daemon
+-- restart can be re-issued by the caller. Pairs with
+-- postgres/0030_migrate_queued_messages.sql.
+--
+-- Belt-and-suspenders: a partial unique index on
+-- (session_id, queue_position) WHERE status='queued' guards the new
+-- `tasks.createPending` race fix at the storage layer, so even if a
+-- transactional read-then-insert ever slipped, the DB would reject the
+-- collision instead of silently double-queuing.
+
+-- 1. Drop legacy queued message rows. They had `index = -1` and never
+--    participated in the conversation, so they're safe to discard.
+DELETE FROM `messages` WHERE `status` = 'queued';
+--> statement-breakpoint
+
+-- 2. Drop messages.status / messages.queue_position via SQLite's
+--    table-rebuild idiom. The composite `messages_queue_idx` covered both
+--    columns and goes away with them.
+PRAGMA foreign_keys=OFF;--> statement-breakpoint
+DROP INDEX IF EXISTS `messages_queue_idx`;--> statement-breakpoint
+CREATE TABLE `__new_messages` (
+  `message_id` text(36) PRIMARY KEY NOT NULL,
+  `created_at` integer NOT NULL,
+  `session_id` text(36) NOT NULL,
+  `task_id` text(36),
+  `type` text NOT NULL,
+  `role` text NOT NULL,
+  `index` integer NOT NULL,
+  `timestamp` integer NOT NULL,
+  `content_preview` text,
+  `parent_tool_use_id` text,
+  `data` text NOT NULL,
+  FOREIGN KEY (`session_id`) REFERENCES `sessions`(`session_id`) ON UPDATE no action ON DELETE cascade,
+  FOREIGN KEY (`task_id`) REFERENCES `tasks`(`task_id`) ON UPDATE no action ON DELETE set null
+);
+--> statement-breakpoint
+INSERT INTO `__new_messages` (
+  `message_id`, `created_at`, `session_id`, `task_id`, `type`, `role`,
+  `index`, `timestamp`, `content_preview`, `parent_tool_use_id`, `data`
+) SELECT
+  `message_id`, `created_at`, `session_id`, `task_id`, `type`, `role`,
+  `index`, `timestamp`, `content_preview`, `parent_tool_use_id`, `data`
+FROM `messages`;
+--> statement-breakpoint
+DROP TABLE `messages`;--> statement-breakpoint
+ALTER TABLE `__new_messages` RENAME TO `messages`;--> statement-breakpoint
+PRAGMA foreign_keys=ON;--> statement-breakpoint
+CREATE INDEX `messages_session_id_idx` ON `messages` (`session_id`);--> statement-breakpoint
+CREATE INDEX `messages_task_id_idx` ON `messages` (`task_id`);--> statement-breakpoint
+CREATE INDEX `messages_session_index_idx` ON `messages` (`session_id`,`index`);--> statement-breakpoint
+
+-- 3. Partial unique index — defense-in-depth for `tasks.createPending` race
+--    serialization. Only QUEUED rows are constrained; CREATED/RUNNING/done
+--    rows have NULL queue_position and are unaffected.
+CREATE UNIQUE INDEX `tasks_queued_position_unique`
+  ON `tasks` (`session_id`, `queue_position`)
+  WHERE `status` = 'queued';

package/dist/core/drizzle/sqlite/0041_restructure_agentic_tool_config.sql

@@ -0,0 +1,204 @@
+-- Restructure per-tool credentials into per-tool buckets.
+--
+-- Lifts encrypted credential strings from two legacy locations:
+--   1. data.api_keys.<FIELD>                      (flat map, current PR's intermediate shape)
+--   2. data.env_vars.<FIELD>                      (legacy plaintext form: string)
+--   3. data.env_vars.<FIELD>.value_encrypted      (v0.5 object form)
+--
+-- ...into the new per-tool structure:
+--   data.agentic_tools.<tool>.<FIELD>             (encrypted string, uniform shape)
+--
+-- Source priority is api_keys > env_vars (api_keys is more recently/explicitly set).
+-- All values stay encrypted at rest — the runtime decrypts on read; URL-typed
+-- fields are still stored as encrypted blobs for shape uniformity.
+--
+-- Idempotency: per-field lift is skipped if the target is already populated.
+-- Non-destructive: source rows are only removed AFTER the target is verified
+-- populated, so a partial run can be safely retried.
+
+-- ============================================================
+-- Lift step: agentic_tools.<tool>.<FIELD> ← api_keys/env_vars
+-- ============================================================
+
+-- claude-code: ANTHROPIC_API_KEY
+UPDATE users SET data = json_set(
+  data,
+  '$.agentic_tools."claude-code".ANTHROPIC_API_KEY',
+  COALESCE(
+    json_extract(data, '$.api_keys.ANTHROPIC_API_KEY'),
+    CASE json_type(data, '$.env_vars.ANTHROPIC_API_KEY')
+      WHEN 'text'   THEN json_extract(data, '$.env_vars.ANTHROPIC_API_KEY')
+      WHEN 'object' THEN json_extract(data, '$.env_vars.ANTHROPIC_API_KEY.value_encrypted')
+    END
+  )
+)
+WHERE json_extract(data, '$.agentic_tools."claude-code".ANTHROPIC_API_KEY') IS NULL
+  AND COALESCE(
+    json_extract(data, '$.api_keys.ANTHROPIC_API_KEY'),
+    CASE json_type(data, '$.env_vars.ANTHROPIC_API_KEY')
+      WHEN 'text'   THEN json_extract(data, '$.env_vars.ANTHROPIC_API_KEY')
+      WHEN 'object' THEN json_extract(data, '$.env_vars.ANTHROPIC_API_KEY.value_encrypted')
+    END
+  ) IS NOT NULL;
+
+-- claude-code: CLAUDE_CODE_OAUTH_TOKEN
+UPDATE users SET data = json_set(
+  data,
+  '$.agentic_tools."claude-code".CLAUDE_CODE_OAUTH_TOKEN',
+  COALESCE(
+    json_extract(data, '$.api_keys.CLAUDE_CODE_OAUTH_TOKEN'),
+    CASE json_type(data, '$.env_vars.CLAUDE_CODE_OAUTH_TOKEN')
+      WHEN 'text'   THEN json_extract(data, '$.env_vars.CLAUDE_CODE_OAUTH_TOKEN')
+      WHEN 'object' THEN json_extract(data, '$.env_vars.CLAUDE_CODE_OAUTH_TOKEN.value_encrypted')
+    END
+  )
+)
+WHERE json_extract(data, '$.agentic_tools."claude-code".CLAUDE_CODE_OAUTH_TOKEN') IS NULL
+  AND COALESCE(
+    json_extract(data, '$.api_keys.CLAUDE_CODE_OAUTH_TOKEN'),
+    CASE json_type(data, '$.env_vars.CLAUDE_CODE_OAUTH_TOKEN')
+      WHEN 'text'   THEN json_extract(data, '$.env_vars.CLAUDE_CODE_OAUTH_TOKEN')
+      WHEN 'object' THEN json_extract(data, '$.env_vars.CLAUDE_CODE_OAUTH_TOKEN.value_encrypted')
+    END
+  ) IS NOT NULL;
+
+-- claude-code: ANTHROPIC_BASE_URL  (env_vars only — was never in api_keys)
+UPDATE users SET data = json_set(
+  data,
+  '$.agentic_tools."claude-code".ANTHROPIC_BASE_URL',
+  CASE json_type(data, '$.env_vars.ANTHROPIC_BASE_URL')
+    WHEN 'text'   THEN json_extract(data, '$.env_vars.ANTHROPIC_BASE_URL')
+    WHEN 'object' THEN json_extract(data, '$.env_vars.ANTHROPIC_BASE_URL.value_encrypted')
+  END
+)
+WHERE json_extract(data, '$.agentic_tools."claude-code".ANTHROPIC_BASE_URL') IS NULL
+  AND CASE json_type(data, '$.env_vars.ANTHROPIC_BASE_URL')
+        WHEN 'text'   THEN json_extract(data, '$.env_vars.ANTHROPIC_BASE_URL')
+        WHEN 'object' THEN json_extract(data, '$.env_vars.ANTHROPIC_BASE_URL.value_encrypted')
+        ELSE NULL
+      END IS NOT NULL;
+
+-- claude-code: ANTHROPIC_AUTH_TOKEN  (env_vars only)
+UPDATE users SET data = json_set(
+  data,
+  '$.agentic_tools."claude-code".ANTHROPIC_AUTH_TOKEN',
+  CASE json_type(data, '$.env_vars.ANTHROPIC_AUTH_TOKEN')
+    WHEN 'text'   THEN json_extract(data, '$.env_vars.ANTHROPIC_AUTH_TOKEN')
+    WHEN 'object' THEN json_extract(data, '$.env_vars.ANTHROPIC_AUTH_TOKEN.value_encrypted')
+  END
+)
+WHERE json_extract(data, '$.agentic_tools."claude-code".ANTHROPIC_AUTH_TOKEN') IS NULL
+  AND CASE json_type(data, '$.env_vars.ANTHROPIC_AUTH_TOKEN')
+        WHEN 'text'   THEN json_extract(data, '$.env_vars.ANTHROPIC_AUTH_TOKEN')
+        WHEN 'object' THEN json_extract(data, '$.env_vars.ANTHROPIC_AUTH_TOKEN.value_encrypted')
+        ELSE NULL
+      END IS NOT NULL;
+
+-- codex: OPENAI_API_KEY
+UPDATE users SET data = json_set(
+  data,
+  '$.agentic_tools.codex.OPENAI_API_KEY',
+  COALESCE(
+    json_extract(data, '$.api_keys.OPENAI_API_KEY'),
+    CASE json_type(data, '$.env_vars.OPENAI_API_KEY')
+      WHEN 'text'   THEN json_extract(data, '$.env_vars.OPENAI_API_KEY')
+      WHEN 'object' THEN json_extract(data, '$.env_vars.OPENAI_API_KEY.value_encrypted')
+    END
+  )
+)
+WHERE json_extract(data, '$.agentic_tools.codex.OPENAI_API_KEY') IS NULL
+  AND COALESCE(
+    json_extract(data, '$.api_keys.OPENAI_API_KEY'),
+    CASE json_type(data, '$.env_vars.OPENAI_API_KEY')
+      WHEN 'text'   THEN json_extract(data, '$.env_vars.OPENAI_API_KEY')
+      WHEN 'object' THEN json_extract(data, '$.env_vars.OPENAI_API_KEY.value_encrypted')
+    END
+  ) IS NOT NULL;
+
+-- gemini: GEMINI_API_KEY
+UPDATE users SET data = json_set(
+  data,
+  '$.agentic_tools.gemini.GEMINI_API_KEY',
+  COALESCE(
+    json_extract(data, '$.api_keys.GEMINI_API_KEY'),
+    CASE json_type(data, '$.env_vars.GEMINI_API_KEY')
+      WHEN 'text'   THEN json_extract(data, '$.env_vars.GEMINI_API_KEY')
+      WHEN 'object' THEN json_extract(data, '$.env_vars.GEMINI_API_KEY.value_encrypted')
+    END
+  )
+)
+WHERE json_extract(data, '$.agentic_tools.gemini.GEMINI_API_KEY') IS NULL
+  AND COALESCE(
+    json_extract(data, '$.api_keys.GEMINI_API_KEY'),
+    CASE json_type(data, '$.env_vars.GEMINI_API_KEY')
+      WHEN 'text'   THEN json_extract(data, '$.env_vars.GEMINI_API_KEY')
+      WHEN 'object' THEN json_extract(data, '$.env_vars.GEMINI_API_KEY.value_encrypted')
+    END
+  ) IS NOT NULL;
+
+-- copilot: COPILOT_GITHUB_TOKEN
+-- (Note: GH_TOKEN / GITHUB_TOKEN are intentionally NOT migrated — they have
+--  legitimate non-Copilot uses (git, gh CLI). The Copilot SDK's own fallback
+--  chain still picks them up at runtime if no per-tool token is set.)
+UPDATE users SET data = json_set(
+  data,
+  '$.agentic_tools.copilot.COPILOT_GITHUB_TOKEN',
+  COALESCE(
+    json_extract(data, '$.api_keys.COPILOT_GITHUB_TOKEN'),
+    CASE json_type(data, '$.env_vars.COPILOT_GITHUB_TOKEN')
+      WHEN 'text'   THEN json_extract(data, '$.env_vars.COPILOT_GITHUB_TOKEN')
+      WHEN 'object' THEN json_extract(data, '$.env_vars.COPILOT_GITHUB_TOKEN.value_encrypted')
+    END
+  )
+)
+WHERE json_extract(data, '$.agentic_tools.copilot.COPILOT_GITHUB_TOKEN') IS NULL
+  AND COALESCE(
+    json_extract(data, '$.api_keys.COPILOT_GITHUB_TOKEN'),
+    CASE json_type(data, '$.env_vars.COPILOT_GITHUB_TOKEN')
+      WHEN 'text'   THEN json_extract(data, '$.env_vars.COPILOT_GITHUB_TOKEN')
+      WHEN 'object' THEN json_extract(data, '$.env_vars.COPILOT_GITHUB_TOKEN.value_encrypted')
+    END
+  ) IS NOT NULL;
+
+-- ============================================================
+-- Cleanup: remove now-redundant source entries.
+-- Each runs only if the corresponding target is verifiably populated.
+-- ============================================================
+
+-- claude-code: ANTHROPIC_API_KEY
+UPDATE users SET data = json_remove(json_remove(data,
+  '$.api_keys.ANTHROPIC_API_KEY'),
+  '$.env_vars.ANTHROPIC_API_KEY')
+WHERE json_extract(data, '$.agentic_tools."claude-code".ANTHROPIC_API_KEY') IS NOT NULL;
+
+-- claude-code: CLAUDE_CODE_OAUTH_TOKEN
+UPDATE users SET data = json_remove(json_remove(data,
+  '$.api_keys.CLAUDE_CODE_OAUTH_TOKEN'),
+  '$.env_vars.CLAUDE_CODE_OAUTH_TOKEN')
+WHERE json_extract(data, '$.agentic_tools."claude-code".CLAUDE_CODE_OAUTH_TOKEN') IS NOT NULL;
+
+-- claude-code: ANTHROPIC_BASE_URL
+UPDATE users SET data = json_remove(data, '$.env_vars.ANTHROPIC_BASE_URL')
+WHERE json_extract(data, '$.agentic_tools."claude-code".ANTHROPIC_BASE_URL') IS NOT NULL;
+
+-- claude-code: ANTHROPIC_AUTH_TOKEN
+UPDATE users SET data = json_remove(data, '$.env_vars.ANTHROPIC_AUTH_TOKEN')
+WHERE json_extract(data, '$.agentic_tools."claude-code".ANTHROPIC_AUTH_TOKEN') IS NOT NULL;
+
+-- codex: OPENAI_API_KEY
+UPDATE users SET data = json_remove(json_remove(data,
+  '$.api_keys.OPENAI_API_KEY'),
+  '$.env_vars.OPENAI_API_KEY')
+WHERE json_extract(data, '$.agentic_tools.codex.OPENAI_API_KEY') IS NOT NULL;
+
+-- gemini: GEMINI_API_KEY
+UPDATE users SET data = json_remove(json_remove(data,
+  '$.api_keys.GEMINI_API_KEY'),
+  '$.env_vars.GEMINI_API_KEY')
+WHERE json_extract(data, '$.agentic_tools.gemini.GEMINI_API_KEY') IS NOT NULL;
+
+-- copilot: COPILOT_GITHUB_TOKEN
+UPDATE users SET data = json_remove(json_remove(data,
+  '$.api_keys.COPILOT_GITHUB_TOKEN'),
+  '$.env_vars.COPILOT_GITHUB_TOKEN')
+WHERE json_extract(data, '$.agentic_tools.copilot.COPILOT_GITHUB_TOKEN') IS NOT NULL;

package/dist/core/drizzle/sqlite/meta/_journal.json

@@ -260,6 +260,27 @@
       "when": 1777000000000,
       "tag": "0038_mcp_oauth_token_refresh",
       "breakpoints": true
+    },
+    {
+      "idx": 39,
+      "version": "6",
+      "when": 1777200000000,
+      "tag": "0039_queued_tasks",
+      "breakpoints": true
+    },
+    {
+      "idx": 40,
+      "version": "6",
+      "when": 1777200100000,
+      "tag": "0040_migrate_queued_messages",
+      "breakpoints": true
+    },
+    {
+      "idx": 41,
+      "version": "6",
+      "when": 1777300000000,
+      "tag": "0041_restructure_agentic_tool_config",
+      "breakpoints": true
     }
   ]
 }

package/dist/core/gateway/index.d.cts

@@ -1,9 +1,9 @@
-import { C as ChannelType } from '../gateway-BnOlAelY.cjs';
+import { C as ChannelType } from '../gateway-BWq4j_Ll.cjs';
 import '../agentic-tool-BulhIUGb.cjs';
 import '../id-CoIbY_uc.cjs';
 import '../session-MNU4BQv4.cjs';
 import '../context-BpkCELpO.cjs';
-import '../user-DkNdeFoz.cjs';
+import '../user-CpfkcV2C.cjs';
 
 /**
  * Gateway Connector Interface

package/dist/core/gateway/index.d.ts

@@ -1,9 +1,9 @@
-import { C as ChannelType } from '../gateway-B_4X-v07.js';
+import { C as ChannelType } from '../gateway-C3Jm_akw.js';
 import '../agentic-tool-cYqsU5i5.js';
 import '../id-CoIbY_uc.js';
 import '../session-CAfhv1qL.js';
 import '../context-BpkCELpO.js';
-import '../user-BfVWBmXA.js';
+import '../user-DP-XZMIM.js';
 
 /**
  * Gateway Connector Interface

package/dist/core/{gateway-BnOlAelY.d.cts → gateway-BWq4j_Ll.d.cts}

@@ -1,7 +1,7 @@
 import { c as AgenticToolName, g as CodexSandboxMode, d as CodexApprovalPolicy } from './agentic-tool-BulhIUGb.cjs';
 import { e as UUID, W as WorktreeID, f as UserID, S as SessionID } from './id-CoIbY_uc.cjs';
 import { P as PermissionMode } from './session-MNU4BQv4.cjs';
-import { c as DefaultModelConfig } from './user-DkNdeFoz.cjs';
+import { l as DefaultModelConfig } from './user-CpfkcV2C.cjs';
 
 /**
  * Gateway Service Types

package/dist/core/{gateway-B_4X-v07.d.ts → gateway-C3Jm_akw.d.ts}

@@ -1,7 +1,7 @@
 import { c as AgenticToolName, g as CodexSandboxMode, d as CodexApprovalPolicy } from './agentic-tool-cYqsU5i5.js';
 import { e as UUID, W as WorktreeID, f as UserID, S as SessionID } from './id-CoIbY_uc.js';
 import { P as PermissionMode } from './session-CAfhv1qL.js';
-import { c as DefaultModelConfig } from './user-BfVWBmXA.js';
+import { l as DefaultModelConfig } from './user-DP-XZMIM.js';
 
 /**
  * Gateway Service Types