@platless/axom-cli 0.6.36 → 0.6.52

package/dist/axom-patch/cli/zcode/generate-env-account.py

@@ -0,0 +1,52 @@
+#!/usr/bin/env python3
+"""Generate after the other pinned ZCode recipes: python3 <script> <pristine-package>."""
+import hashlib
+import json
+import sys
+from pathlib import Path
+
+root = Path(__file__).resolve().parents[1]
+package = Path(sys.argv[1])
+assert json.loads((package / 'package.json').read_text())['version'] == '0.80.0'
+files = {}
+runtime = json.loads((root / 'runtime.json').read_text())
+for name in runtime['package_patches']:
+    recipe = json.loads((root / name).read_text())
+    if recipe['package'] != 'zcode-acp-server' or recipe['id'] == 'zcode-env-account':
+        continue
+    for edit in recipe['edits']:
+        source = files.get(edit['file'], (package / edit['file']).read_text())
+        assert hashlib.sha256(source.encode()).hexdigest() == edit['before_sha256']
+        files[edit['file']] = source.replace(edit['before'], edit['after'], 1)
+
+edits = []
+def edit(file, before, after):
+    source = files.get(file, (package / file).read_text())
+    assert source.count(before) == 1, (file, before[:80], source.count(before))
+    result = source.replace(before, after, 1)
+    edits.append(dict(file=file, before_sha256=hashlib.sha256(source.encode()).hexdigest(),
+                      after_sha256=hashlib.sha256(result.encode()).hexdigest(), before=before, after=after))
+    files[file] = result
+
+edit('dist/config/bridge-accounts.js', 'import { randomUUID } from "node:crypto";',
+     'import { readEnvAccount } from "./axom-env-account.mjs";\nimport { randomUUID } from "node:crypto";')
+edit('dist/config/bridge-accounts.js',
+     'function overlayAccounts() {\n    try {\n        return readBridgeAccounts();\n    }\n    catch (error) {\n        warnOnce(`bridge-accounts: ignoring saved accounts. ${error.message}`);\n        return {};\n    }\n}',
+     'function overlayAccounts() {\n    const env = readEnvAccount(codingPlanCatalog);\n    try {\n        return { ...readBridgeAccounts(), ...env };\n    }\n    catch (error) {\n        warnOnce(`bridge-accounts: ignoring saved accounts. ${error.message}`);\n        return env;\n    }\n}')
+
+edit('dist/index.js', 'const result = await server.initialize(ctx.params, ctx.client);',
+     'if (process.env.ZCODE_API_KEY) (await import("./config/bridge-accounts.js")).bridgeOverlays(); '
+     'const result = await server.initialize(ctx.params, ctx.client);')
+edit('dist/index.js', 'const { buildAccountProviderConfig, codingPlanRequestAuthFor } = await import("./config/account-provider.js");',
+     'const { buildAccountProviderConfig, codingPlanRequestAuthFor, configProviderIdFor } = await import("./config/account-provider.js");')
+edit('dist/index.js', 'if (!provider?.access?.entitled) continue;',
+     'if (!provider?.access?.entitled || (process.env.ZCODE_API_KEY && configProviderIdFor(providerId) !== process.env.ZCODE_PROVIDER)) continue;')
+edit('dist/handlers/session.js',
+     'const pinnedModel = process.env.ZCODE_MODEL;\n        if (pinnedProvider && pinnedModel)',
+     'const pinnedModel = process.env.ZCODE_MODEL ?? (process.env.ZCODE_API_KEY ? loadAllModels()[0]?.modelId : undefined);\n        if (pinnedProvider && pinnedModel)')
+
+asset = root / 'zcode/env-account.mjs'
+recipe = dict(id='zcode-env-account', package='zcode-acp-server', versions=['0.80.0'],
+              assets=[dict(source='zcode/env-account.mjs', target='dist/config/axom-env-account.mjs',
+                           sha256=hashlib.sha256(asset.read_bytes()).hexdigest())], edits=edits)
+(root / 'zcode-env-account.json').write_text(json.dumps(recipe, ensure_ascii=False, indent=2) + '\n')

package/dist/axom-patch/cli/zcode-account-limits.json

@@ -2,27 +2,27 @@
   "id": "zcode-account-limits",
   "package": "zcode-acp-server",
   "versions": [
-    "0.76.3"
+    "0.80.0"
   ],
   "edits": [
     {
       "file": "dist/index.js",
-      "before_sha256": "646b2203e7f3e950d2da202f6802f211ca70a7ccb67e017e78174106f5fda1ef",
-      "after_sha256": "00378165f2bbf9c97534805c0e8373e01d0c06049d976be78a1b387d23dc3adc",
+      "before_sha256": "982001fdae54eb211ed3ad0af459035ce42696df2303ee0a50e94aff07b4f1b8",
+      "after_sha256": "82fc48b741090d8a178e5dca26f226960f9c2f222badc9c334347cc4b6300d22",
       "before": "        .onRequest(\"account/usage_stats\", z.object({}).passthrough(), () => accountUsageStatsViaHub())",
       "after": "        .onRequest(axomQuota.READ, z.object({}).passthrough(), async () => {\n            const { buildAccountProviderConfig, codingPlanRequestAuthFor } = await import(\"./config/account-provider.js\");\n            const { resolveQuotaHost } = await import(\"./quota/client.js\");\n            let apiKey = null, family = \"\";\n            for (const [providerId, provider] of Object.entries(buildAccountProviderConfig()?.providers ?? {})) {\n                if (!provider?.access?.entitled) continue;\n                const auth = codingPlanRequestAuthFor(providerId);\n                if (auth?.apiKey) { apiKey = auth.apiKey; family = providerId; break; }\n            }\n            if (!apiKey) throw new Error(\"No entitled GLM coding plan: sign in once in the ZCode desktop app\");\n            const resp = await fetch(resolveQuotaHost(family.startsWith(\"account:zai\") ? \"https://api.z.ai\" : \"\") + \"/api/monitor/usage/quota/limit\", { headers: { Accept: \"application/json, text/plain, */*\", Authorization: \"Bearer \" + apiKey }, signal: AbortSignal.timeout(8000) });\n            const text = await resp.text();\n            let json = null; try { json = text ? JSON.parse(text) : null; } catch {}\n            if (resp.status === 429 || !json || json.success !== true) throw new Error(\"GLM quota read failed\" + (json?.msg ? \": \" + json.msg : \" (HTTP \" + resp.status + \")\"));\n            const snapshot = axomQuota.zcode({ provider: family, level: json.data?.level, limits: json.data?.limits });\n            axomQuotaNotify(snapshot);\n            return snapshot;\n        })\n        .onRequest(\"account/usage_stats\", z.object({}).passthrough(), () => accountUsageStatsViaHub())"
     },
     {
       "file": "dist/index.js",
-      "before_sha256": "00378165f2bbf9c97534805c0e8373e01d0c06049d976be78a1b387d23dc3adc",
-      "after_sha256": "f9b292c102776aa4d125bbedb7c415fce5316cadd48096a438710fa21140d323",
+      "before_sha256": "82fc48b741090d8a178e5dca26f226960f9c2f222badc9c334347cc4b6300d22",
+      "after_sha256": "f0cff75cf1da73f39f72d6ac7f32b6e9811ecef5743a987f3fb043dbe7275d96",
       "before": "        .onRequest(\"initialize\", (ctx) => server.initialize(ctx.params, ctx.client))",
       "after": "        .onRequest(\"initialize\", async (ctx) => { const result = await server.initialize(ctx.params, ctx.client); const caps = result.agentCapabilities ?? {}; result.agentCapabilities = { ...caps, _meta: { ...caps._meta, \"axom/accountRateLimits\": { ...axomQuota.CAPABILITY, provider: \"zcode\" } } }; return result; })"
     },
     {
       "file": "dist/index.js",
-      "before_sha256": "f9b292c102776aa4d125bbedb7c415fce5316cadd48096a438710fa21140d323",
-      "after_sha256": "fb88f1e5275d100e94c7a95e0bd919489fa4e07932f21cd37faa7e44dc6525fa",
+      "before_sha256": "f0cff75cf1da73f39f72d6ac7f32b6e9811ecef5743a987f3fb043dbe7275d96",
+      "after_sha256": "00e43e449e3e428778a8b4ee2f1ab4535d28113bf7e1504e8215cba76d6629b4",
       "before": "#!/usr/bin/env node\n/**\n * Entry point: wire the ZcodeAcpServer to a stdio ACP stream.\n *\n * The ACP",
       "after": "#!/usr/bin/env node\n\nconst axomQuota = (() => {\n/** Account quota normalization. No I/O: passive events must never trigger a query. */\nconst READ = '_axom/account/rateLimits/read';\nconst UPDATED = '_axom/account/rateLimits/updated';\nconst CAPABILITY = { version: 2, read: true, updated: true };\nconst percent = v => typeof v === 'number' && Number.isFinite(v) ? Math.max(0, Math.min(100, v)) : null;\nconst finite = v => { if (v == null || typeof v === 'boolean') return null; const n = typeof v === 'number' ? v : Number(v); return Number.isFinite(n) ? n : null; };\nconst time = (v, milliseconds = false) => {\n  if (v == null || v === 0) return null;\n  const d = new Date(typeof v === 'number' ? v * (milliseconds ? 1 : 1000) : v);\n  return Number.isFinite(d.getTime()) ? d.toISOString() : null;\n};\nconst status = v => ({ allowed: 'allowed', allowed_warning: 'warning', rejected: 'blocked', normal: 'allowed' }[v] ?? 'unknown');\n/** Canonical window key rides the snapshot; the UI owns the key → display-label translation.\n *  Windows without a canonical key keep their vendor content untouched. */\nconst windowKey = (seconds, period) => period === 'month' ? 'monthly' : seconds === 18000 ? 'five_hour' : seconds === 604800 ? 'weekly' : null;\nconst base = (provider, mode, raw, observedAt) => ({ schemaVersion: 1, updateMode: 'snapshot', provider, billingMode: mode, availability: mode === 'subscription' ? 'available' : mode === 'unknown' ? 'unknown' : 'not_applicable', observedAt: observedAt ?? new Date().toISOString(), plan: null, limits: [], balances: [], _meta: { ['_' + provider]: structuredClone(raw) } });\nfunction codex(raw, authType = 'chatgpt', observedAt) {\n  const out = base('codex', ['chatgpt', 'chatgptAuthTokens'].includes(authType) ? 'subscription' : ['apiKey','apikey','amazonBedrock'].includes(authType) ? 'non_subscription' : 'unknown', raw, observedAt);\n  if (out.billingMode !== 'subscription') return out;\n  const buckets = Object.entries(raw.rateLimitsByLimitId ?? {});\n  if (!buckets.length && raw.rateLimits) buckets.push([raw.rateLimits.limitId ?? 'codex', raw.rateLimits]);\n  for (const [id, bucket] of buckets) {\n    if (!bucket) continue;\n    if (bucket.planType) out.plan = { id: bucket.planType, label: bucket.planType };\n    for (const name of ['primary', 'secondary']) {\n      const w = bucket[name]; if (!w) continue;\n      const seconds = w.windowDurationMins == null ? null : w.windowDurationMins * 60;\n      out.limits.push({ id: `${id}.${name}`, label: bucket.limitName ?? id, kind: 'subscription', windowSeconds: seconds, key: windowKey(seconds), usedPercent: percent(w.usedPercent), resetsAt: time(w.resetsAt), status: bucket.rateLimitReachedType ? 'blocked' : 'unknown', scope: { bucket: id } });\n    }\n    if (bucket.credits) out.balances.push({ id: `${id}.credits`, label: 'Credits', remaining: bucket.credits.balance ?? null, unit: 'credits', unlimited: bucket.credits.unlimited === true });\n  }\n  // Account IDs must not escape via provider extensions.\n  delete out._meta._codex.accountId;\n  return out;\n}\n/** App-server notifications describe changed buckets, not the complete account read. */\nfunction codexEvent(raw, authType, observedAt) {\n  return { ...codex(raw, authType, observedAt), updateMode: 'delta' };\n}\nfunction claude(raw, observedAt) {\n  const mode = raw.billing_mode ?? (raw.subscription_type || raw.rate_limits_available === true ? 'subscription' : 'unknown');\n  const out = base('claude', mode, raw, observedAt);\n  out.plan = raw.subscription_type ? { id: raw.subscription_type, label: raw.subscription_type } : null;\n  if (mode === 'subscription' && !raw.rate_limits_available) out.availability = 'unavailable';\n  const limits = raw.rate_limits ?? {};\n  const rows = Array.isArray(limits.limits) ? limits.limits : [];\n  if (rows.length) {\n    rows.forEach((w, i) => {\n      const seconds = w.group === 'session' ? 18000 : w.group === 'weekly' ? 604800 : null;\n      out.limits.push({ id: `claude.${w.kind}.${i}`, label: w.scope?.model?.display_name ?? w.kind, kind: 'subscription', windowSeconds: seconds, key: windowKey(seconds), usedPercent: percent(w.percent), resetsAt: time(w.resets_at), status: status(w.severity), active: w.is_active ?? null, scope: w.scope ?? null });\n    });\n  } else for (const [id, seconds] of [['five_hour', 18000], ['seven_day', 604800], ['seven_day_opus',604800], ['seven_day_sonnet',604800]]) {\n    const w = limits[id]; if (!w) continue;\n    out.limits.push({ id: `claude.${id}`, label: id, kind: 'subscription', windowSeconds: seconds, key: windowKey(seconds), usedPercent: percent(w.utilization), resetsAt: time(w.resets_at), status: 'unknown', scope: id.endsWith('opus') || id.endsWith('sonnet') ? { model: id.split('_').at(-1) } : null });\n  }\n  const spend=limits.spend;\n  if(spend?.enabled && spend.used && spend.limit) out.limits.push({id:'claude.extra_spend',label:'Extra usage',kind:'spend',windowSeconds:null,usedPercent:percent(spend.percent),resetsAt:null,status:status(spend.severity),used:String(spend.used.amount_minor),limit:String(spend.limit.amount_minor),unit:'money',currency:spend.used.currency,exponent:spend.used.exponent});\n  if(spend?.balance?.amount_minor != null) out.balances.push({id:'claude.extra_balance',label:'Extra usage balance',remaining:String(spend.balance.amount_minor),unit:'money',currency:spend.balance.currency,exponent:spend.balance.exponent});\n  return out;\n}\nfunction claudeEvent(raw, previous = null, observedAt) {\n  const out = previous ? structuredClone(previous) : base('claude',raw.rateLimitType?'subscription':'unknown',{},observedAt);\n  out.updateMode = 'delta';\n  out.balances = [];\n  out.observedAt = observedAt ?? new Date().toISOString();\n  // Other sessions may have refreshed the account since this process's cached read.\n  // Send only facts from this event; the server owns the merged account observation.\n  out.plan = null;\n  out._meta = { _claude: { rateLimitEvent: raw } };\n  const seconds = raw.rateLimitType === 'five_hour' ? 18000 : raw.rateLimitType?.startsWith('seven_day') ? 604800 : null;\n  if (seconds !== null) {\n    const id = `claude.${raw.rateLimitType}`;\n    const scoped = !['five_hour','seven_day'].includes(raw.rateLimitType);\n    const prior=out.limits.find(w => w.windowSeconds===seconds && JSON.stringify(w.scope??null)===JSON.stringify(scoped ? {model:raw.rateLimitType.split('_').at(-1)}:null));\n    const row = { id: prior?.id ?? id, label: raw.rateLimitType, kind: 'subscription', windowSeconds: seconds, key: windowKey(seconds), usedPercent: raw.utilization == null ? null : percent(raw.utilization * 100), resetsAt: time(raw.resetsAt), status: status(raw.status), scope: scoped ? { model: raw.rateLimitType.split('_').at(-1) } : null };\n    // Event utilization is a ratio, unlike get_usage's percentage. Match the existing window without duplicating it.\n    out.limits = [row];\n  } else out.limits = [];\n  return out;\n}\nfunction kimi(raw, observedAt) {\n  const quota = raw.quota ?? raw;\n  const out = base('kimi','subscription',quota,observedAt);\n  for (const [id, seconds] of [['limit5h',18000],['limit7d',604800],['monthTotal',null]]) {\n    const w = quota.usages?.[id]; if (!w) continue;\n    out.limits.push({ id: `kimi.${id}`, label: id, kind: 'subscription', windowSeconds: seconds, period: id === 'monthTotal' ? 'month' : null, key: windowKey(seconds, id === 'monthTotal' ? 'month' : null), usedPercent: percent(w.usedRatio * 100), resetsAt: time(w.resetAt), status: 'unknown' });\n  }\n  const wallet = quota.extraUsage;\n  if (wallet) out.balances.push({ id:'kimi.extra',label:'Extra usage',remaining:String(wallet.balanceCents),unit:'money',currency:wallet.currency,exponent:2 });\n  return out;\n}\n/** GLM quota `percentage` is the USED share (measured: 5% for 58/1000); counters win when present.\n * Counter-derived shares are rounded to 2 decimals — 100-94.2 keeps fp noise otherwise. */\nconst glmPercent = limit => {\n  const used = finite(limit.currentValue), remaining = finite(limit.remaining), total = finite(limit.usage);\n  const cap = remaining !== null && used !== null ? remaining + used : total;\n  const round2 = v => v == null ? null : Math.round(v * 100) / 100;\n  if (cap !== null && cap > 0 && remaining !== null && remaining >= 0 && remaining <= cap) return round2(100 - percent(remaining / cap * 100));\n  if (cap !== null && cap > 0 && used !== null && used >= 0 && used <= cap) return round2(percent(used / cap * 100));\n  return percent(limit.percentage);\n};\nfunction zcode(raw, observedAt) {\n  // Raw: the GLM quota endpoint's data block — { level, limits: [{ type, number, usage,\n  // currentValue, remaining, percentage, nextResetTime(epoch ms), usageDetails }] }. Which windows\n  // exist is plan-dependent (measured pro plan: 5h prompts + a tool/MCP allowance; no weekly row —\n  // a `number: 7` window maps when a plan returns one, and nothing is invented when it doesn't).\n  const limits = Array.isArray(raw?.limits) ? raw.limits : [];\n  const level = typeof raw?.level === 'string' && raw.level ? raw.level : null;\n  const out = base('zcode', limits.length ? 'subscription' : 'unknown', raw, observedAt);\n  out.plan = level ? { id: level, label: level } : null;\n  let tools = 0;\n  limits.forEach((limit, i) => {\n    if (!limit || typeof limit !== 'object') return;\n    const resetsAt = time(limit.nextResetTime, true);\n    if (limit.type === 'TOKENS_LIMIT') {\n      // GLM window convention: number 5 → the 5-hour prompt window, 7 → weekly.\n      // Ids mirror the adapter's own /quota keys (token_5h / token_week).\n      const seconds = limit.number === 5 ? 18000 : limit.number === 7 ? 604800 : null;\n      const label = limit.number === 5 ? '5h' : limit.number === 7 ? 'Week' : `token ${limit.number ?? i}`;\n      const id = limit.number === 5 ? 'zcode.token_5h' : limit.number === 7 ? 'zcode.token_week' : `zcode.token_${limit.number ?? i}`;\n      out.limits.push({ id, label, kind: 'subscription', windowSeconds: seconds, key: windowKey(seconds), usedPercent: glmPercent(limit), resetsAt, status: 'unknown' });\n    } else if (limit.type === 'TIME_LIMIT' || limit.type === 'MCP_LIMIT') {\n      // Built-in tool/MCP allowance: absolute counters (unit 'calls'); per-model detail stays in _meta.\n      const used = finite(limit.currentValue), total = finite(limit.usage), remaining = finite(limit.remaining);\n      out.limits.push({ id: tools ? `zcode.mcp.${i}` : 'zcode.mcp', label: 'MCP', kind: 'subscription', windowSeconds: null, usedPercent: glmPercent(limit), ...(used !== null && total !== null ? { used: String(used), limit: String(total), unit: 'calls' } : {}), resetsAt, status: remaining === 0 ? 'blocked' : used !== null || limit.percentage != null ? 'allowed' : 'unknown' });\n      tools++;\n    }\n  });\n  return out;\n}\nfunction commandcode(raw, observedAt) {\n  const subscription = raw.subscription?.data ?? raw.subscription;\n  const windows = raw.credits?.windowLimits ?? raw.windowLimits;\n  const subscribed = ['active','trialing','past_due'].includes(subscription?.status) || windows?.limited === true;\n  const mode = subscribed ? 'subscription' : subscription || windows ? 'non_subscription' : 'unknown';\n  const out = base('commandcode',mode,raw,observedAt);\n  out.plan = subscription?.planId ? { id:subscription.planId,label:subscription.planId } : null;\n  for (const [id, seconds] of [['fiveHour',18000],['weekly',604800]]) {\n    const w=windows?.[id]; if (!w) continue;\n    out.limits.push({ id:`commandcode.${id}`,label:id,kind:'subscription',windowSeconds:seconds,key:windowKey(seconds),usedPercent:w.cap > 0 ? percent(w.used / w.cap * 100) : null,used:String(w.used),limit:String(w.cap),unit:'credits',resetsAt:time(w.resetAt,true),status:w.exceeded === true ? 'blocked' : 'allowed' });\n  }\n  const credits=raw.credits?.credits ?? raw.credits;\n  if (subscribed && credits?.monthlyCredits != null) {\n    const cap=raw.monthly?.limit;\n    const known=typeof cap==='number' && Number.isFinite(cap) && cap>0;\n    const used=known ? Math.max(0,cap-credits.monthlyCredits) : null;\n    out.limits.push({id:'commandcode.monthly',label:'Monthly',kind:'subscription',windowSeconds:null,period:'month',key:windowKey(null,'month'),usedPercent:known?percent(used/cap*100):null,resetsAt:time(subscription?.currentPeriodEnd,true),status:'unknown',...(known?{used:String(used),limit:String(cap),unit:'credits'}:{})});\n  }\n  for (const [id,label] of [['monthlyCredits','Monthly credits'],['purchasedCredits','Purchased credits'],['freeCredits','Free credits']]) if (credits?.[id] != null) out.balances.push({ id:`commandcode.${id}`,label,remaining:String(credits[id]),unit:'credits' });\n  return out;\n}\n\nreturn {READ,UPDATED,CAPABILITY,codex,codexEvent,claude,claudeEvent,kimi,commandcode,zcode};\n})();\nconst axomQuotaNotify = snapshot => process.stdout.write(JSON.stringify({jsonrpc:\"2.0\",method:axomQuota.UPDATED,params:snapshot})+\"\\n\");\n/**\n * Entry point: wire the ZcodeAcpServer to a stdio ACP stream.\n *\n * The ACP"
     }

package/dist/axom-patch/cli/zcode-env-account.json

@@ -0,0 +1,58 @@
+{
+  "id": "zcode-env-account",
+  "package": "zcode-acp-server",
+  "versions": [
+    "0.80.0"
+  ],
+  "assets": [
+    {
+      "source": "zcode/env-account.mjs",
+      "target": "dist/config/axom-env-account.mjs",
+      "sha256": "b936067b9ee2ee42dfd9b331e5c642022c38a8739dc6e66d7bcfeb2e293ff046"
+    }
+  ],
+  "edits": [
+    {
+      "file": "dist/config/bridge-accounts.js",
+      "before_sha256": "aefcb48f6cf64085e3cf3fca76ec16a0e1edf65e34033a7be41a89ed1521492f",
+      "after_sha256": "935683330d9c23e50ded074a5218b7651a6344a5026dd83f7a3a3b0d9aadec97",
+      "before": "import { randomUUID } from \"node:crypto\";",
+      "after": "import { readEnvAccount } from \"./axom-env-account.mjs\";\nimport { randomUUID } from \"node:crypto\";"
+    },
+    {
+      "file": "dist/config/bridge-accounts.js",
+      "before_sha256": "935683330d9c23e50ded074a5218b7651a6344a5026dd83f7a3a3b0d9aadec97",
+      "after_sha256": "7000e117941758917c00f6564e1333385541e79777ef712c8a7870d454fbd7d1",
+      "before": "function overlayAccounts() {\n    try {\n        return readBridgeAccounts();\n    }\n    catch (error) {\n        warnOnce(`bridge-accounts: ignoring saved accounts. ${error.message}`);\n        return {};\n    }\n}",
+      "after": "function overlayAccounts() {\n    const env = readEnvAccount(codingPlanCatalog);\n    try {\n        return { ...readBridgeAccounts(), ...env };\n    }\n    catch (error) {\n        warnOnce(`bridge-accounts: ignoring saved accounts. ${error.message}`);\n        return env;\n    }\n}"
+    },
+    {
+      "file": "dist/index.js",
+      "before_sha256": "00e43e449e3e428778a8b4ee2f1ab4535d28113bf7e1504e8215cba76d6629b4",
+      "after_sha256": "d07d3900a6d88e29d4e18d562b4298cddf362e792e5a861ad839ba79cc2c92e7",
+      "before": "const result = await server.initialize(ctx.params, ctx.client);",
+      "after": "if (process.env.ZCODE_API_KEY) (await import(\"./config/bridge-accounts.js\")).bridgeOverlays(); const result = await server.initialize(ctx.params, ctx.client);"
+    },
+    {
+      "file": "dist/index.js",
+      "before_sha256": "d07d3900a6d88e29d4e18d562b4298cddf362e792e5a861ad839ba79cc2c92e7",
+      "after_sha256": "f5945f9fa858c03ea183176c57b0c1794925779f0c8b26d9acd970316351c548",
+      "before": "const { buildAccountProviderConfig, codingPlanRequestAuthFor } = await import(\"./config/account-provider.js\");",
+      "after": "const { buildAccountProviderConfig, codingPlanRequestAuthFor, configProviderIdFor } = await import(\"./config/account-provider.js\");"
+    },
+    {
+      "file": "dist/index.js",
+      "before_sha256": "f5945f9fa858c03ea183176c57b0c1794925779f0c8b26d9acd970316351c548",
+      "after_sha256": "28fcf1c87700d0da9b7820e778d507208ae66c22b340d02f1c3719cba2888a62",
+      "before": "if (!provider?.access?.entitled) continue;",
+      "after": "if (!provider?.access?.entitled || (process.env.ZCODE_API_KEY && configProviderIdFor(providerId) !== process.env.ZCODE_PROVIDER)) continue;"
+    },
+    {
+      "file": "dist/handlers/session.js",
+      "before_sha256": "ba9c2d4c131356661d5c79a89c840cb2d7a5dca65005c1d65bb5dd72871a7dfe",
+      "after_sha256": "bdf68cef3906a597f5f568a3f53cca880391bd7f6ab5700ba8ed3a2572509d34",
+      "before": "const pinnedModel = process.env.ZCODE_MODEL;\n        if (pinnedProvider && pinnedModel)",
+      "after": "const pinnedModel = process.env.ZCODE_MODEL ?? (process.env.ZCODE_API_KEY ? loadAllModels()[0]?.modelId : undefined);\n        if (pinnedProvider && pinnedModel)"
+    }
+  ]
+}

package/dist/axom-patch/cli/zcode-models.json

@@ -2,34 +2,34 @@
   "id": "zcode-models",
   "package": "zcode-acp-server",
   "versions": [
-    "0.76.3"
+    "0.80.0"
   ],
   "edits": [
     {
       "file": "dist/config/options.js",
-      "before_sha256": "7f30e0dbf281280b7043cc686990eff3785bc62206a4b369313b27333cf9c330",
-      "after_sha256": "4641e5097c667e9b351ee7f0dee89a5a517332f452b1fc878e0396775b9870f8",
+      "before_sha256": "40605e6a76bfe9df5af4101b3b09c66c63247e245645603a51c42a85044f7826",
+      "after_sha256": "508042a42e89da936df13f0330cb79669a4e876781bf178cc529ec2d8d8684e0",
       "before": "import { configProviderIdFor } from \"./account-provider.js\";",
       "after": "import { buildAccountProviderConfig as axomAccountProviders, codingPlanRequestAuthFor as axomPlanAuth, configProviderIdFor } from \"./account-provider.js\";"
     },
     {
       "file": "dist/config/options.js",
-      "before_sha256": "4641e5097c667e9b351ee7f0dee89a5a517332f452b1fc878e0396775b9870f8",
-      "after_sha256": "286ad8d2b6f734ae1168cbe2095c25660016db10eee6ccc4d285a64fe8cc2cd4",
+      "before_sha256": "508042a42e89da936df13f0330cb79669a4e876781bf178cc529ec2d8d8684e0",
+      "after_sha256": "e46ef7e6ff4418b54eacb333e8f55968abbbf9488427939925e126e95a555f61",
       "before": "/** Read the config.json contents (UTF-8). Throws on read/parse failure. */",
       "after": "function axomFreshInstallModels() {\n    const fallback = { providerId: DEFAULT_PROVIDER_ID, providerName: DEFAULT_PROVIDER_NAME, modelId: DEFAULT_MODEL_ID };\n    try {\n        const out = [];\n        for (const [pid, p] of Object.entries(axomAccountProviders()?.providers ?? {})) {\n            if (!p?.access?.entitled || !axomPlanAuth(pid)?.apiKey) continue;\n            const providerId = configProviderIdFor(pid);\n            for (const modelId of p.builtinModelIds ?? []) {\n                if (out.some((m) => m.providerId === providerId && m.modelId === modelId)) continue;\n                out.push({ providerId, providerName: providerId, modelId });\n            }\n        }\n        if (out.length === 0) return [fallback];\n        return out.some((m) => m.providerId === fallback.providerId && m.modelId === fallback.modelId)\n            ? [fallback, ...out.filter((m) => !(m.providerId === fallback.providerId && m.modelId === fallback.modelId))]\n            : [fallback, ...out];\n    }\n    catch {\n        return [fallback];\n    }\n}\n\n/** Read the config.json contents (UTF-8). Throws on read/parse failure. */"
     },
     {
       "file": "dist/config/options.js",
-      "before_sha256": "286ad8d2b6f734ae1168cbe2095c25660016db10eee6ccc4d285a64fe8cc2cd4",
-      "after_sha256": "c6fae88f596ee0cbb633317c0f83c2c883a2b2a5d8978bfc4fd6a6d152f77ccb",
+      "before_sha256": "e46ef7e6ff4418b54eacb333e8f55968abbbf9488427939925e126e95a555f61",
+      "after_sha256": "e15b0b9977c6be120a53fba1fa282b4fd00194f9f49ebc94b221a8aa3bd04101",
       "before": "        if (out.length === 0 && Object.keys(cfg.provider ?? {}).length === 0) {\n            return [\n                {\n                    providerId: DEFAULT_PROVIDER_ID,\n                    providerName: DEFAULT_PROVIDER_NAME,\n                    modelId: DEFAULT_MODEL_ID,\n                },\n            ];\n        }",
       "after": "        if (out.length === 0 && Object.keys(cfg.provider ?? {}).length === 0) {\n            return axomFreshInstallModels();\n        }"
     },
     {
       "file": "dist/config/options.js",
-      "before_sha256": "c6fae88f596ee0cbb633317c0f83c2c883a2b2a5d8978bfc4fd6a6d152f77ccb",
-      "after_sha256": "d12eded70f22d8d9010de9949c0809b1f56f2c33635899764ca9f893fec0d256",
+      "before_sha256": "e15b0b9977c6be120a53fba1fa282b4fd00194f9f49ebc94b221a8aa3bd04101",
+      "after_sha256": "e4624ca2590a3e577eeb73a7e7f9a961623dd486a5d78d238ed1db7a09a16a16",
       "before": "        if (out.length > 0)\n            return out;\n        return [\n            {\n                providerId: DEFAULT_PROVIDER_ID,\n                providerName: DEFAULT_PROVIDER_NAME,\n                modelId: DEFAULT_MODEL_ID,\n            },\n        ];\n    }\n}",
       "after": "        if (out.length > 0)\n            return out;\n        return axomFreshInstallModels();\n    }\n}"
     }

package/dist/axom-patch/cli/zcode-subagent-subwork.json

@@ -2,7 +2,7 @@
   "id": "zcode-subagent-subwork",
   "package": "zcode-acp-server",
   "versions": [
-    "0.76.3"
+    "0.80.0"
   ],
   "edits": [
     {
@@ -28,15 +28,15 @@
     },
     {
       "file": "dist/server.js",
-      "before_sha256": "40a55e7b7fc6662a664f9d462dd4c8774e2e73d222669cb3902448c026b6b6a2",
-      "after_sha256": "95e940c79d16571c1c125d4536c88c94136ddc09713dee65e003cce3ac2a4a8e",
+      "before_sha256": "42db5e33c8abdceaede811ae6ca318a08c23d9681052299c7226ddc41fe561b9",
+      "after_sha256": "e29a42ff87e89ab8141425b47c70bb12d97f7beba6cf2cc99a410fd779b04596",
       "before": "export class ZcodeAcpServer {",
-      "after": "/** Axom patch `zcode-subagent-subwork`: normalize ZCode sub-agents and background\n * tasks into the draft ACP subagent variants (RFD #1992) and the AIR async-task\n * extension — the same contracts claude-agent-acp ships. The backend already emits\n * first-class lifecycle events on `session.updated` (agentId/childSessionId for\n * sub-agents, taskId for background tasks); this listener forwards them so hosts\n * can project subworks, and dispatch.js re-scopes a foreground sub-agent's internal\n * `tool_subagent_*` tool calls onto its child session. */\nclass AxomZcodeSubagents {\n    constructor(server, zcodeSid) {\n        this.server = server;\n        this.sid = zcodeSid;\n        /** agentId → { agentId, child, background, terminal, pendingState, pendingP, resultSeen, preview } */\n        this.agents = new Map();\n        /** parentToolCallId → agent record (foreground result flush). */\n        this.parents = new Map();\n        /** taskId → { terminal } (bash/exec background tasks only). */\n        this.tasks = new Map();\n    }\n    /** Draft RFD #1992 negotiated — the axom daemon always declares this. */\n    nativeOk() {\n        const caps = this.server.clientCapabilities;\n        return !!(caps && caps.subagents);\n    }\n    /** AIR async-task capability declared (`_meta.jetbrains.air.capabilities`). */\n    asyncOk() {\n        const air = this.server.clientCapabilities?._meta?.jetbrains?.air;\n        return !!(air && Array.isArray(air.capabilities) && air.capabilities.includes(\"asyncTasks\"));\n    }\n    handleEvent(ev) {\n        try {\n            void this.onEvent(ev);\n        }\n        catch {\n            // Never crash the bridge from a normalization observer.\n        }\n    }\n    async onEvent(ev) {\n        if (!ev || ev.type !== \"session.updated\") {\n            this.onToolEvent(ev);\n            return;\n        }\n        const p = ev.payload ?? {};\n        if (typeof p.agentId === \"string\" && p.agentId && typeof p.childSessionId === \"string\" && p.childSessionId) {\n            this.onAgent(p);\n            return;\n        }\n        // Sub-agent background tasks also carry taskId with taskKind \"subagent\" —\n        // the agentId path above owns those. Workflow runs have their own poller.\n        if (typeof p.taskId === \"string\" && p.taskId && p.taskKind !== \"subagent\" && p.taskKind !== \"workflow\") {\n            this.onTask(p);\n        }\n    }\n    onAgent(p) {\n        if (!this.nativeOk())\n            return;\n        const agentId = p.agentId;\n        const child = p.childSessionId;\n        const status = typeof p.status === \"string\" ? p.status : \"running\";\n        let rec = this.agents.get(agentId);\n        if (!rec) {\n            rec = { agentId, child, background: p.background === true, terminal: false, pendingState: null, pendingP: null, resultSeen: false, preview: null };\n            this.agents.set(agentId, rec);\n            if (typeof p.parentToolCallId === \"string\" && p.parentToolCallId)\n                this.parents.set(p.parentToolCallId, rec);\n            // First sighting already terminal (adapter restart): adopt — emit the\n            // spawn so the host can still link the child, then the state below.\n            if (status !== \"running\")\n                rec.resultSeen = true;\n            this.emit({\n                sessionUpdate: \"subagent_spawned\",\n                subagentSessionId: child,\n                name: (typeof p.description === \"string\" && p.description) || (typeof p.agentType === \"string\" && p.agentType) || \"Subagent\",\n                task: typeof p.prompt === \"string\" ? p.prompt : (p.description ?? \"\"),\n                capabilities: {},\n                _meta: { zcode: { agentId, parentToolCallId: p.parentToolCallId, background: rec.background, adopted: status !== \"running\" } },\n            });\n        }\n        if (rec.child !== child)\n            return;\n        const mapped = status === \"completed\" ? \"completed\"\n            : status === \"failed\" || status === \"error\" ? \"failed\"\n                : status === \"cancelled\" || status === \"stopped\" ? \"cancelled\"\n                    : status === \"disconnected\" ? \"disconnected\" : null;\n        if (!mapped || rec.terminal)\n            return;\n        if (rec.background || rec.resultSeen || mapped !== \"completed\") {\n            this.finishAgent(rec, mapped, p);\n            return;\n        }\n        // Foreground completion: hold the state until the parent Agent tool's own\n        // result event arrives (one event later, measured) so the child-scoped\n        // preview precedes the terminal state on the wire.\n        rec.pendingState = mapped;\n        rec.pendingP = p;\n    }\n    finishAgent(rec, state, p) {\n        rec.terminal = true;\n        if (rec.preview) {\n            this.emitChild(rec.child, { sessionUpdate: \"agent_message_chunk\", content: { type: \"text\", text: rec.preview } });\n            rec.preview = null;\n        }\n        const meta = { zcode: { agentId: rec.agentId } };\n        if (p) {\n            for (const key of [\"parentToolCallId\", \"outputFile\"])\n                if (typeof p[key] === \"string\")\n                    meta.zcode[key] = p[key];\n            if (typeof p.totalTokens === \"number\")\n                meta.zcode.totalTokens = p.totalTokens;\n            if (typeof p.totalDurationMs === \"number\")\n                meta.zcode.totalDurationMs = p.totalDurationMs;\n        }\n        this.emit({ sessionUpdate: \"subagent_state_update\", subagentSessionId: rec.child, state, _meta: meta });\n    }\n    onToolEvent(ev) {\n        if (!ev || ev.type !== \"tool.updated\")\n            return;\n        const p = ev.payload ?? {};\n        if (p.kind !== \"result\" || typeof p.toolCallId !== \"string\")\n            return;\n        const rec = this.parents.get(p.toolCallId);\n        if (!rec || rec.terminal || rec.background)\n            return;\n        rec.resultSeen = true;\n        const text = axomSubagentResultPreview(p.result);\n        if (text)\n            rec.preview = text;\n        if (rec.pendingState)\n            this.finishAgent(rec, rec.pendingState, rec.pendingP);\n    }\n    onTask(p) {\n        if (!this.asyncOk())\n            return;\n        const taskId = p.taskId;\n        let task = this.tasks.get(taskId);\n        const status = typeof p.status === \"string\" ? p.status : \"running\";\n        if (!task) {\n            task = { terminal: false };\n            this.tasks.set(taskId, task);\n            this.emit({\n                sessionUpdate: \"async_task_spawned\",\n                asyncTaskId: taskId,\n                name: (typeof p.description === \"string\" && p.description) || (typeof p.command === \"string\" && p.command) || \"background task\",\n                taskType: typeof p.taskKind === \"string\" ? p.taskKind : \"shell\",\n                description: typeof p.description === \"string\" ? p.description : \"\",\n                showInTranscript: false,\n                canStop: p.cancellable === true,\n                ...(typeof p.outputPath === \"string\" ? { outputFilePath: p.outputPath } : {}),\n                ...(typeof p.toolCallId === \"string\" ? { toolCallId: p.toolCallId } : {}),\n                _meta: { zcode: { taskKind: p.taskKind, command: p.command } },\n            });\n        }\n        const mapped = status === \"completed\" ? \"completed\"\n            : status === \"failed\" || status === \"error\" ? \"failed\"\n                : status === \"cancelled\" ? \"stopped\" : null;\n        if (!mapped || task.terminal)\n            return;\n        task.terminal = true;\n        this.emit({\n            sessionUpdate: \"async_task_state_update\",\n            asyncTaskId: taskId,\n            state: mapped,\n            ...(typeof p.toolCallId === \"string\" ? { toolCallId: p.toolCallId } : {}),\n        });\n    }\n    emit(update) {\n        void this.server.notifyByZcodeSid(this.sid, update);\n    }\n    emitChild(childId, update) {\n        const server = this.server;\n        if (!server.clients || server.clients.size === 0)\n            return;\n        void enqueueSessionSend(childId, () => server.clients.broadcast().notify(\"session/update\", { sessionId: childId, update }));\n    }\n}\n/** The parent Agent tool's result carries the sub-agent's final message plus an\n * `agentId:` line and a `<usage>` block that belong to the envelope, not the\n * answer. The backend delivers the payload as a JSON string or as an already\n * parsed object (both measured) — accept either. */\nfunction axomSubagentResultPreview(result) {\n    let content = null;\n    if (typeof result === \"string\") {\n        try {\n            const parsed = JSON.parse(result);\n            if (parsed && typeof parsed.content === \"string\")\n                content = parsed.content;\n        }\n        catch {\n            content = result;\n        }\n    }\n    else if (result && typeof result === \"object\" && typeof result.content === \"string\") {\n        content = result.content;\n    }\n    if (typeof content !== \"string\" || !content.trim())\n        return null;\n    const stripped = content\n        .replace(/<usage>[\\s\\S]*?<\\/usage>/g, \"\")\n        .split(\"\\n\")\n        .filter((line) => !/^agentId:\\s*\\S+/.test(line))\n        .join(\"\\n\")\n        .trim();\n    return stripped ? stripped.slice(0, 2000) : null;\n}\nexport { AxomZcodeSubagents };\nexport class ZcodeAcpServer {"
+      "after": "/** Axom patch `zcode-subagent-subwork`: normalize ZCode sub-agents and background\n * tasks into the draft ACP subagent variants (RFD #1992) and the AIR async-task\n * extension — the same contracts claude-agent-acp ships. The backend already emits\n * first-class lifecycle events on `session.updated` (agentId/childSessionId for\n * sub-agents, taskId for background tasks); this listener forwards them so hosts\n * can project subworks, and dispatch.js re-scopes a foreground sub-agent's internal\n * `tool_subagent_*` tool calls onto its child session. */\nclass AxomZcodeSubagents {\n    constructor(server, zcodeSid) {\n        this.server = server;\n        this.sid = zcodeSid;\n        /** agentId → { agentId, child, background, terminal, pendingState, pendingP, resultSeen, preview } */\n        this.agents = new Map();\n        /** parentToolCallId → agent record (foreground result flush). */\n        this.parents = new Map();\n        /** taskId → { terminal } (bash/exec background tasks only). */\n        this.tasks = new Map();\n    }\n    /** Draft RFD #1992 negotiated — the axom daemon always declares this. */\n    nativeOk() {\n        const caps = this.server.clientCapabilities;\n        return !!(caps && caps.subagents);\n    }\n    /** AIR async-task capability declared (`_meta.jetbrains.air.capabilities`). */\n    asyncOk() {\n        const air = this.server.clientCapabilities?._meta?.jetbrains?.air;\n        return !!(air && Array.isArray(air.capabilities) && air.capabilities.includes(\"asyncTasks\"));\n    }\n    handleEvent(ev) {\n        try {\n            void this.onEvent(ev);\n        }\n        catch {\n            // Never crash the bridge from a normalization observer.\n        }\n    }\n    async onEvent(ev) {\n        if (!ev || ev.type !== \"session.updated\") {\n            this.onToolEvent(ev);\n            return;\n        }\n        const p = ev.payload ?? {};\n        if (typeof p.agentId === \"string\" && p.agentId && typeof p.childSessionId === \"string\" && p.childSessionId) {\n            this.onAgent(p);\n            return;\n        }\n        // Sub-agent background tasks also carry taskId with taskKind \"subagent\" —\n        // the agentId path above owns those. Workflow runs have their own poller.\n        if (typeof p.taskId === \"string\" && p.taskId && p.taskKind !== \"subagent\" && p.taskKind !== \"workflow\") {\n            this.onTask(p);\n        }\n    }\n    onAgent(p) {\n        if (!this.nativeOk())\n            return;\n        const agentId = p.agentId;\n        const child = p.childSessionId;\n        const status = typeof p.status === \"string\" ? p.status : \"running\";\n        let rec = this.agents.get(agentId);\n        if (!rec) {\n            rec = { agentId, child, background: p.background === true, terminal: false, pendingState: null, pendingP: null, resultSeen: false, preview: null };\n            this.agents.set(agentId, rec);\n            if (typeof p.parentToolCallId === \"string\" && p.parentToolCallId)\n                this.parents.set(p.parentToolCallId, rec);\n            // First sighting already terminal (adapter restart): adopt — emit the\n            // spawn so the host can still link the child, then the state below.\n            if (status !== \"running\")\n                rec.resultSeen = true;\n            this.emit({\n                sessionUpdate: \"subagent_spawned\",\n                subagentSessionId: child,\n                name: (typeof p.description === \"string\" && p.description) || (typeof p.agentType === \"string\" && p.agentType) || \"Subagent\",\n                task: typeof p.prompt === \"string\" ? p.prompt : (p.description ?? \"\"),\n                capabilities: {},\n                _meta: { zcode: { agentId, parentToolCallId: p.parentToolCallId, background: rec.background, adopted: status !== \"running\" } },\n            });\n        }\n        if (rec.child !== child)\n            return;\n        const mapped = status === \"completed\" ? \"completed\"\n            : status === \"failed\" || status === \"error\" ? \"failed\"\n                : status === \"cancelled\" || status === \"stopped\" ? \"cancelled\"\n                    : status === \"disconnected\" ? \"disconnected\" : null;\n        if (!mapped || rec.terminal)\n            return;\n        if (rec.background || rec.resultSeen || mapped !== \"completed\") {\n            this.finishAgent(rec, mapped, p);\n            return;\n        }\n        // Foreground completion: hold the state until the parent Agent tool's own\n        // result event arrives (one event later, measured) so the child-scoped\n        // preview precedes the terminal state on the wire.\n        rec.pendingState = mapped;\n        rec.pendingP = p;\n    }\n    finishAgent(rec, state, p) {\n        rec.terminal = true;\n        if (rec.preview) {\n            this.emitChild(rec.child, { sessionUpdate: \"agent_message_chunk\", content: { type: \"text\", text: rec.preview } });\n            rec.preview = null;\n        }\n        const meta = { zcode: { agentId: rec.agentId } };\n        if (p) {\n            for (const key of [\"parentToolCallId\", \"outputFile\"])\n                if (typeof p[key] === \"string\")\n                    meta.zcode[key] = p[key];\n            if (typeof p.totalTokens === \"number\")\n                meta.zcode.totalTokens = p.totalTokens;\n            if (typeof p.totalDurationMs === \"number\")\n                meta.zcode.totalDurationMs = p.totalDurationMs;\n        }\n        this.emit({ sessionUpdate: \"subagent_state_update\", subagentSessionId: rec.child, state, _meta: meta });\n    }\n    onToolEvent(ev) {\n        if (!ev || ev.type !== \"tool.updated\")\n            return;\n        const p = ev.payload ?? {};\n        if (p.kind !== \"result\" || typeof p.toolCallId !== \"string\")\n            return;\n        const rec = this.parents.get(p.toolCallId);\n        if (!rec || rec.terminal || rec.background)\n            return;\n        rec.resultSeen = true;\n        const text = axomSubagentResultPreview(p.result);\n        if (text)\n            rec.preview = text;\n        if (rec.pendingState)\n            this.finishAgent(rec, rec.pendingState, rec.pendingP);\n    }\n    onTask(p) {\n        if (!this.asyncOk())\n            return;\n        const taskId = p.taskId;\n        let task = this.tasks.get(taskId);\n        const status = typeof p.status === \"string\" ? p.status : \"running\";\n        if (!task) {\n            task = { terminal: false };\n            this.tasks.set(taskId, task);\n            this.emit({\n                sessionUpdate: \"async_task_spawned\",\n                asyncTaskId: taskId,\n                name: (typeof p.description === \"string\" && p.description) || (typeof p.command === \"string\" && p.command) || \"background task\",\n                taskType: typeof p.taskKind === \"string\" ? p.taskKind : \"shell\",\n                description: typeof p.description === \"string\" ? p.description : \"\",\n                showInTranscript: false,\n                canStop: p.cancellable === true,\n                ...(typeof p.outputPath === \"string\" ? { outputFilePath: p.outputPath } : {}),\n                ...(typeof p.toolCallId === \"string\" ? { toolCallId: p.toolCallId } : {}),\n                _meta: { zcode: { taskKind: p.taskKind, command: p.command } },\n            });\n        }\n        // Preserve cumulative backend output without reviving already settled tasks.\n        const output = p.outputTail ?? p.stdoutTail;\n        if (!task.terminal && typeof output === \"string\" && output && output !== task.outputTail) {\n            task.outputTail = output;\n            this.emit({\n                sessionUpdate: \"async_task_progress\", asyncTaskId: taskId,\n                ...(typeof p.toolCallId === \"string\" ? { toolCallId: p.toolCallId } : {}),\n                ...(typeof p.outputPath === \"string\" ? { outputFilePath: p.outputPath } : {}),\n                _meta: { zcode: { outputTail: output } },\n            });\n        }\n        const mapped = status === \"completed\" ? \"completed\"\n            : status === \"failed\" || status === \"error\" ? \"failed\"\n                : status === \"cancelled\" ? \"stopped\" : null;\n        if (!mapped || task.terminal)\n            return;\n        task.terminal = true;\n        this.emit({\n            sessionUpdate: \"async_task_state_update\",\n            asyncTaskId: taskId,\n            state: mapped,\n            ...(typeof p.toolCallId === \"string\" ? { toolCallId: p.toolCallId } : {}),\n        });\n    }\n    emit(update) {\n        void this.server.notifyByZcodeSid(this.sid, update);\n    }\n    emitChild(childId, update) {\n        const server = this.server;\n        if (!server.clients || server.clients.size === 0)\n            return;\n        void enqueueSessionSend(childId, () => server.clients.broadcast().notify(\"session/update\", { sessionId: childId, update }));\n    }\n}\n/** The parent Agent tool's result carries the sub-agent's final message plus an\n * `agentId:` line and a `<usage>` block that belong to the envelope, not the\n * answer. The backend delivers the payload as a JSON string or as an already\n * parsed object (both measured) — accept either. */\nfunction axomSubagentResultPreview(result) {\n    let content = null;\n    if (typeof result === \"string\") {\n        try {\n            const parsed = JSON.parse(result);\n            if (parsed && typeof parsed.content === \"string\")\n                content = parsed.content;\n        }\n        catch {\n            content = result;\n        }\n    }\n    else if (result && typeof result === \"object\" && typeof result.content === \"string\") {\n        content = result.content;\n    }\n    if (typeof content !== \"string\" || !content.trim())\n        return null;\n    const stripped = content\n        .replace(/<usage>[\\s\\S]*?<\\/usage>/g, \"\")\n        .split(\"\\n\")\n        .filter((line) => !/^agentId:\\s*\\S+/.test(line))\n        .join(\"\\n\")\n        .trim();\n    return stripped ? stripped.slice(0, 2000) : null;\n}\nexport { AxomZcodeSubagents };\nexport class ZcodeAcpServer {"
     },
     {
       "file": "dist/server.js",
-      "before_sha256": "95e940c79d16571c1c125d4536c88c94136ddc09713dee65e003cce3ac2a4a8e",
-      "after_sha256": "240a49618e47792dfbaa5f713dca8072bd1e0c56f726e177a1936e071c69df42",
+      "before_sha256": "e29a42ff87e89ab8141425b47c70bb12d97f7beba6cf2cc99a410fd779b04596",
+      "after_sha256": "00aa402eebd8537507c324371b3baaad851f3e409c97b3394b8c3e7fefc0e498",
       "before": "        backend.registerEventListener(zcodeSid, new SessionTitleListener(this, zcodeSid));\n        this.backgroundListenerBackend.set(zcodeSid, backend);",
       "after": "        backend.registerEventListener(zcodeSid, new SessionTitleListener(this, zcodeSid));\n        backend.registerEventListener(zcodeSid, new AxomZcodeSubagents(this, zcodeSid));\n        this.backgroundListenerBackend.set(zcodeSid, backend);"
     },
@@ -56,15 +56,15 @@
     },
     {
       "file": "dist/handlers/session.js",
-      "before_sha256": "770b8094520487b3eefbea3b47edfad82895bb2658b38dd8c70b201f29ac07be",
-      "after_sha256": "86877e687c74d97e581a0991e549842130567e2041cf4caa10b8ae910a0f2a77",
+      "before_sha256": "d78d4a702ff01fc539de62c84cdb04c5a5c1486dc6de6554edf2b8ac5c3b788d",
+      "after_sha256": "cf260853e2940ce841f8ac0f8788574a30a047c4da38006099ecca4bf1bced72",
       "before": "async function adoptStoredTitle(server, acpSid, zcodeSid) {\n    if (server.sessionTitles.has(acpSid))\n        return;",
       "after": "async function adoptStoredTitle(server, acpSid, zcodeSid) {\n    // Axom patch `zcode-subagent-subwork`: the in-memory title is usually the first\n    // prompt's echo; the backend's stored generated title is the real answer, and the\n    // live titleUpdated push is routinely lost at a backend respawn boundary — this\n    // load-time read is then the only surviving copy. A user-pinned rename still wins.\n    if (server.sessionTitles.has(acpSid) && server.titleUserSetBy.has(acpSid))\n        return;"
     },
     {
       "file": "dist/handlers/session.js",
-      "before_sha256": "86877e687c74d97e581a0991e549842130567e2041cf4caa10b8ae910a0f2a77",
-      "after_sha256": "ba1d5ba52957793c9f392ee6ab425a13eb912e1a5544b485d548d11e25f95a95",
+      "before_sha256": "cf260853e2940ce841f8ac0f8788574a30a047c4da38006099ecca4bf1bced72",
+      "after_sha256": "ba9c2d4c131356661d5c79a89c840cb2d7a5dca65005c1d65bb5dd72871a7dfe",
       "before": "        if (hit?.title) {\n            server.sessionTitles.set(acpSid, hit.title);\n            server.touchSessionSummary(acpSid, hit.title);\n            refreshTerminalTabTitle(server, acpSid);\n            log(`adopted stored title for ${acpSid.slice(0, 8)}: ${hit.title}`);\n        }",
       "after": "        if (hit?.title && server.sessionTitles.get(acpSid) !== hit.title) {\n            server.sessionTitles.set(acpSid, hit.title);\n            server.touchSessionSummary(acpSid, hit.title);\n            refreshTerminalTabTitle(server, acpSid);\n            // Axom patch `zcode-subagent-subwork`: broadcast so hosts sync the stored\n            // generated title on (re-)attach — the live push was lost at a respawn.\n            void sendSessionUpdate(server.clients.broadcast(), acpSid, {\n                sessionUpdate: \"session_info_update\",\n                title: hit.title,\n                updatedAt: new Date().toISOString(),\n            }).catch(() => { });\n            log(`adopted stored title for ${acpSid.slice(0, 8)}: ${hit.title}`);\n        }"
     }

package/dist/cli.js

@@ -13,9 +13,9 @@ import { registerWorkstationCommands } from './commands/workstation.js';
 import { whoamiAction } from './commands/whoami.js';
 import { runCredentialBroker } from './credentials.js';
 import { runCommand } from './output.js';
-import { install, restart, start, status, stop, uninstall } from './workstation/daemonctl.js';
+import { clientDir } from './workstation/config.js';
+import { executeDeviceLifecycle, inspectLocalDevice } from './workstation/control/deviceCommands.js';
 import { runDaemon } from './workstation/daemon.js';
-import { registerWorkstation } from './workstation/register.js';
 import { detectSupervision } from './workstation/supervision.js';
 import { CLIENT_VERSION } from './workstation/version.js';
 export function buildProgram() {
@@ -46,19 +46,17 @@ export function buildProgram() {
     registerSkillsCommands(program);
     registerUpdateCommand(program);
     registerWorkstationCommands(program, {
-        start, stop, restart, install, uninstall, runDaemon, registerWorkstation,
+        start: () => executeDeviceLifecycle('start', clientDir()),
+        stop: () => executeDeviceLifecycle('stop', clientDir()),
+        restart: () => executeDeviceLifecycle('restart', clientDir()),
+        install: () => executeDeviceLifecycle('install', clientDir()),
+        uninstall: () => executeDeviceLifecycle('uninstall', clientDir()), runDaemon,
         status: async () => {
-            const current = await status();
-            if (current.uncertain)
-                return 'workstation state is unknown; run `axom workstation inspect --json` to verify it';
-            return current.running
-                ? `running connected to ${current.server ?? 'unknown server'} as ${current.workstationId ?? 'unknown workstation'}`
-                : 'stopped';
+            const current = await inspectLocalDevice(clientDir());
+            return `${current.runtime.state}; ${current.registrations.length} workstation registrations`;
         },
         log: console.log,
-        authenticate: (server) => authAction({ server }),
         detectSupervision,
-        isInteractive: () => Boolean(process.stdin.isTTY),
     });
     return program;
 }

package/dist/commands/auth.js

@@ -5,9 +5,12 @@ import { authorizeDevice } from '../workstation/oauth/deviceAuthorization.js';
 import { revokeAndClearTokens, revokeRefreshToken, saveTokens } from '../credentials.js';
 import { cliRequestedScopes } from '../authScopes.js';
 export const DEFAULT_SERVER_URL = 'http://localhost:8080';
+export function resolveAuthServer(config, explicit) {
+    return resolveServer(config, explicit ?? config.defaultServer ?? DEFAULT_SERVER_URL);
+}
 export async function authAction(options, deps = {}) {
     const config = await loadConfig();
-    const server = resolveServer(config, options.server ?? config.defaultServer ?? DEFAULT_SERVER_URL);
+    const server = resolveAuthServer(config, options.server);
     const host = hostname();
     const { accessToken, refreshToken, expiresInSeconds, scopes } = await authorizeDevice(server, `Axomwork CLI (${host})`, host, deps, cliRequestedScopes(options.cowork));
     const updated = await loadConfig();

package/dist/commands/update.js

@@ -1,12 +1,16 @@
 import { z } from 'zod';
 import { inspectWorkstation } from '../workstation/control/inspect.js';
-import { requestRuntimeUpdate } from '../workstation/control/runtimeClient.js';
+import { requestDeviceRuntimeUpdate, requestRuntimeUpdate } from '../workstation/control/runtimeClient.js';
+import { inspectLocalDevice } from '../workstation/control/deviceCommands.js';
+import { assertDeviceGuard, deviceRuntimeUpdateRequestSchema } from '../workstation/control/deviceProtocol.js';
 import { withWorkstationLock } from '../workstation/control/locks.js';
 import { bindingGuardSchema, LocalControlError } from '../workstation/control/protocol.js';
 import { enrollmentFailure } from '../workstation/control/enrollment.js';
 import { readLocalRequest } from '../workstation/control/commands.js';
 import { deploymentDownloadURL, normalizeWorkstationServer, workstationEndpoint } from '../workstation/control/serverIdentity.js';
 import { randomUUID } from 'node:crypto';
+import { promises as fs } from 'node:fs';
+import path from 'node:path';
 import { UsageError, loadConfig, resolveServer } from '../config.js';
 import { runCommand } from '../output.js';
 import { clientDir } from '../workstation/config.js';
@@ -64,6 +68,26 @@ export async function updateAction(options, deps = {}) {
     };
     const dir = deps.dir ?? clientDir();
     if (!deps.createCoordinator) {
+        let deviceRoot = false;
+        for (const name of ['device.json', 'legacy-migration.json']) {
+            try {
+                await fs.lstat(path.join(dir, name));
+                deviceRoot = true;
+            }
+            catch (error) {
+                if (error.code !== 'ENOENT')
+                    throw error;
+            }
+        }
+        if (deviceRoot) {
+            const current = await inspectLocalDevice(dir);
+            const result = await updateLocalCli({ schemaVersion: 2, action: 'update', operationId: `manual-${randomUUID()}`, server, guard: { deviceRevision: current.deviceRevision, runtimeGeneration: current.runtime.generation }, expectedRelease: { version: release.version, sha512: release.sha512 } }, dir, fetchImpl);
+            if (result.status === 'succeeded' || result.status === 'pending' && !result.error) {
+                (deps.log ?? console.log)(result.status === 'pending' ? 'Update requested. Check workstation status for progress.' : `Installed ${release.version}.`);
+                return;
+            }
+            throw new Error(result.error?.message ?? 'The workstation is busy; try again when its work finishes.');
+        }
         const current = await inspectWorkstation(dir);
         const result = await updateLocalCli({ operationId: `manual-${randomUUID()}`, server, guard: { revision: current.revision, runtimeGeneration: current.runtime.generation }, expectedRelease: { version: release.version, sha512: release.sha512 } }, dir, fetchImpl);
         if (result.status === 'succeeded' || result.status === 'pending') {
@@ -96,7 +120,34 @@ export async function updateAction(options, deps = {}) {
     }
 }
 const updateRequestSchema = z.object({ operationId: z.string().min(1).max(128), server: z.string(), guard: bindingGuardSchema, expectedRelease: z.object({ version: z.string(), sha512: z.string().regex(/^[a-f0-9]{128}$/i) }).strict() }).strict();
+const deviceUpdateCliSchema = deviceRuntimeUpdateRequestSchema.omit({ release: true }).extend({ expectedRelease: updateRequestSchema.shape.expectedRelease }).strict();
+async function updateDeviceCli(raw, directory, fetchImpl) {
+    let operationId = randomUUID();
+    try {
+        const request = deviceUpdateCliSchema.parse(raw);
+        operationId = request.operationId;
+        const server = normalizeWorkstationServer(request.server);
+        const current = await inspectLocalDevice(directory);
+        if (current.runtime.state !== 'running')
+            throw new LocalControlError('OUTCOME_UNKNOWN', 'Start and verify the original device owner before updating');
+        assertDeviceGuard(request.guard, current);
+        const release = await fetchManifest(server, fetchImpl);
+        if (release.version !== request.expectedRelease.version || release.sha512 !== request.expectedRelease.sha512)
+            throw new LocalControlError('BINDING_CONFLICT', 'The published release changed; review it again');
+        deploymentDownloadURL(server, release.url);
+        const status = await requestDeviceRuntimeUpdate(directory, { schemaVersion: 2, action: 'update', operationId, server, guard: request.guard, release });
+        const result = ['BUSY', 'UPDATE_IN_PROGRESS'].includes(status.phase) ? 'busy' : status.phase === 'SUCCEEDED' ? 'succeeded' : ['FAILED', 'ROLLED_BACK'].includes(status.phase) ? 'failed' : 'pending';
+        const inspection = await inspectLocalDevice(directory).catch(() => null);
+        return { operationId, registrationId: null, status: result, inspection, ...(status.error ? { error: { code: 'SERVICE_FAILED', message: status.error } } : {}) };
+    }
+    catch (error) {
+        const code = error instanceof LocalControlError ? error.code : 'UNSUPPORTED_PROTOCOL';
+        return { operationId, registrationId: null, status: code === 'BUSY' ? 'busy' : code === 'OUTCOME_UNKNOWN' ? 'pending' : 'failed', inspection: null, error: { code, message: 'Device update requires the original verified owner and unchanged source/release' } };
+    }
+}
 export async function updateLocalCli(raw, directory, fetchImpl = globalThis.fetch) {
+    if (raw && typeof raw === 'object' && 'schemaVersion' in raw)
+        return updateDeviceCli(raw, directory, fetchImpl);
     try {
         const request = updateRequestSchema.parse(raw);
         const server = normalizeWorkstationServer(request.server);
@@ -104,17 +155,26 @@ export async function updateLocalCli(raw, directory, fetchImpl = globalThis.fetc
         if (manifest.version !== request.expectedRelease.version || manifest.sha512 !== request.expectedRelease.sha512)
             throw new LocalControlError('BINDING_CONFLICT', 'The published release changed; review it again');
         manifest.url = deploymentDownloadURL(server, manifest.url);
+        const before = await inspectWorkstation(directory);
+        if (before.revision !== request.guard.revision || before.runtime.generation !== request.guard.runtimeGeneration)
+            throw new LocalControlError('BINDING_CONFLICT', 'Workstation changed; check it again');
+        if (before.runtime.state === 'unknown')
+            throw new LocalControlError('OUTCOME_UNKNOWN', 'Stop and verify the existing daemon before updating');
+        if (before.runtime.state === 'running') {
+            if (before.runtime.binding?.server !== server)
+                throw new LocalControlError('INSTANCE_OCCUPIED', 'Another server owns the running daemon');
+            const status = await requestRuntimeUpdate(directory, manifest, request.operationId);
+            return { status: ['BUSY', 'UPDATE_IN_PROGRESS'].includes(status.phase) ? 'busy' : status.phase === 'SUCCEEDED' ? 'succeeded' : status.phase === 'FAILED' || status.phase === 'ROLLED_BACK' ? 'failed' : 'pending', inspection: await inspectWorkstation(directory) };
+        }
         return await withWorkstationLock(directory, 'installation', () => withWorkstationLock(directory, 'operation', async () => {
             const current = await inspectWorkstation(directory);
             if (current.revision !== request.guard.revision || current.runtime.generation !== request.guard.runtimeGeneration)
                 throw new LocalControlError('BINDING_CONFLICT', 'Workstation changed; check it again');
             if (current.runtime.state === 'unknown')
                 throw new LocalControlError('OUTCOME_UNKNOWN', 'Stop and verify the existing daemon before updating');
-            if (current.runtime.state === 'running' && current.runtime.binding?.server !== server)
-                throw new LocalControlError('INSTANCE_OCCUPIED', 'Another server owns the running daemon');
-            const status = current.runtime.state === 'running'
-                ? await requestRuntimeUpdate(directory, manifest, request.operationId)
-                : await createUpdateCoordinator({ dir: directory, server, cliPath: CLI_PATH, serviceLifecycle: 'none', installationLockHeld: true }).handle({ commandId: request.operationId, release: manifest, force: false });
+            if (current.runtime.state !== 'stopped')
+                throw new LocalControlError('OUTCOME_UNKNOWN', 'The original stopped owner changed before offline update admission');
+            const status = await createUpdateCoordinator({ dir: directory, server, cliPath: CLI_PATH, serviceLifecycle: 'none', installationLockHeld: true }).handle({ commandId: request.operationId, release: manifest, force: false });
             return { status: ['BUSY', 'UPDATE_IN_PROGRESS'].includes(status.phase) ? 'busy' : status.phase === 'SUCCEEDED' ? 'succeeded' : status.phase === 'FAILED' || status.phase === 'ROLLED_BACK' ? 'failed' : 'pending', inspection: await inspectWorkstation(directory) };
         }));
     }
@@ -144,7 +204,8 @@ export function registerUpdateCommand(program) {
         catch (error) {
             result = await enrollmentFailure(error, clientDir());
         }
+        const device = deviceUpdateCliSchema.safeParse(request);
         const id = updateRequestSchema.safeParse(request);
-        process.stdout.write(JSON.stringify({ schemaVersion: 1, kind: 'result', operationId: id.success ? id.data.operationId : randomUUID(), result }) + '\n');
+        process.stdout.write(JSON.stringify({ schemaVersion: device.success ? 2 : 1, kind: 'result', operationId: device.success ? device.data.operationId : id.success ? id.data.operationId : randomUUID(), result }) + '\n');
     }));
 }