@rubytech/create-maxy-code 0.1.566 → 0.1.568

package/payload/platform/services/claude-session-manager/dist/http-server.js

@@ -29,10 +29,12 @@ import { buildWebchatChannelMcpServers, buildWebchatChannelArgv, webchatChannelM
 import { buildTelegramChannelMcpServers, buildTelegramChannelArgv, telegramChannelMcpConfigPath, TELEGRAM_CHANNEL_SERVER_NAME } from './telegram-channel-mcp.js';
 import { buildChannelMcpServers, buildChannelArgv, channelMcpConfigPath, CHANNEL_SERVER_NAME } from './channel-mcp.js';
 import { buildRcPublicLockdownArgv, formatToolAllowlistLine, PUBLIC_ALLOWED_TOOLS_ENV, allowedToolsFromArgv, formatRoleResolutionLine, } from './rc-public-lockdown.js';
+import { resolvePublicSpawnModel } from './public-spawn-model.js';
 import { mergeTarget, isMultiTarget, targetKinds } from './channel-targets.js';
 import { randomUUID, createHash } from 'node:crypto';
 import { execFile, execFileSync } from 'node:child_process';
 import { buildRcChildEnv, reapplyAdminLevers } from './rc-daemon.js';
+import { syncAccountAgentRegistry } from './account-agent-registry.js';
 import { resolveSpawnUserId, formatMcpUserBindingLine } from './mcp-user-binding.js';
 import { runConnectorAuthLogin } from './connector-auth.js';
 import { isEffortLevel, isNewSessionEffortLevel, isPermissionMode, SONNET_MODEL } from '../../../lib/models/dist/index.js';
@@ -41,7 +43,7 @@ import { parseWorkServerRegistration, formatSpawnToolsLine } from './passive-spa
 import { parsePrintSurface } from './passive-print-surface.js';
 import { writeScopeRecord, removeScopeRecord, readAllScopeRecords } from './scope-record.js';
 import { writeReseatMarker, resolveReseatChain, clearReseatMarker } from './reseat-ledger.js';
-import { getScopeMainPid, defaultProcessSignals, defaultSystemctlRunner } from './systemd-scope.js';
+import { getScopeMainPid, scopeUnitName, defaultProcessSignals, defaultSystemctlRunner } from './systemd-scope.js';
 import { readSidecar, updateSidecar, appendBridgeId, writeSidecar } from './session-sidecar.js';
 import { houseAdminScopeFor, isHouseAccount, formatHouseScopeInjectLine } from './config.js';
 import { resolvePassiveAssignee, readHouseAdminUserIds } from './passive-admin-assignment.js';
@@ -280,10 +282,17 @@ function tailHasDanglingToolUse(jsonlPath) {
  *  record so the synthetic record matches claude's own shape; uuid and
  *  timestamp are minted. Idempotent: returns false when nothing dangles or on
  *  any error. */
-export function appendTurnAbortTerminator(jsonlPath, sessionId) {
+export function appendTurnAbortTerminator(jsonlPath, sessionId, 
+/** Task 2457 — supplied only when the child was terminated by a signal rather
+ *  than stopped by the operator. With no dangling tool_use there is nothing to
+ *  repair for a later --resume, but the transcript may still hold the CLI's
+ *  `[Request interrupted by user for tool use]` line, which is false in that
+ *  case: the CLI writes it for ANY mid-tool teardown, and it resolves the
+ *  dangle, so this function used to return false and leave the lie standing. */
+termination) {
     try {
         const ids = danglingToolUseIds(jsonlPath);
-        if (ids.length === 0)
+        if (ids.length === 0 && !termination)
             return false;
         const raw = readFileSync(jsonlPath, 'utf8').trimEnd().split('\n');
         let envelope = {};
@@ -307,12 +316,22 @@ export function appendTurnAbortTerminator(jsonlPath, sessionId) {
             timestamp: new Date().toISOString(),
             message: {
                 role: 'user',
-                content: ids.map((id) => ({
-                    tool_use_id: id,
-                    type: 'tool_result',
-                    content: 'Turn aborted: the agent process exited before this tool finished.',
-                    is_error: true,
-                })),
+                // Task 2457 — the termination text names no culprit. This manager
+                // observes only that its own child took a signal; the process that sent
+                // it belongs to another brand and writes to another log.
+                content: ids.length > 0
+                    ? ids.map((id) => ({
+                        tool_use_id: id,
+                        type: 'tool_result',
+                        content: 'Turn aborted: the agent process exited before this tool finished.',
+                        is_error: true,
+                    }))
+                    : [{
+                            type: 'text',
+                            text: 'Turn ended by process termination, not by the operator. The agent process exited '
+                                + `with code ${termination.exitCode ?? 'unknown'} while this turn was streaming `
+                                + `(scope ${termination.unit}).`,
+                        }],
             },
         };
         appendFileSync(jsonlPath, JSON.stringify(record) + '\n');
@@ -571,6 +590,7 @@ function attachEndTurnAutoClose(deps, sessionId, label) {
         closed = true;
         deps.logger(`auto-archive sessionId=${sessionId} ${label} reason=end-turn archivedAt=${new Date().toISOString()}`);
         void stopSession({
+            brandSlug: deps.brandSlug,
             killGraceMs: deps.killGraceMs,
             logger: deps.logger,
             runSystemctl: deps.runSystemctl,
@@ -2053,6 +2073,7 @@ export function buildHttpApp(deps) {
             recycleSession: async (sid) => {
                 const row = resolveRow(deps.watcher, sid);
                 await stopSession({
+                    brandSlug: deps.brandSlug,
                     killGraceMs: deps.killGraceMs,
                     logger: deps.logger,
                     runSystemctl: deps.runSystemctl,
@@ -2107,6 +2128,7 @@ export function buildHttpApp(deps) {
             deps.logger(`[stop-session] resolved sessionId=${sessionId.slice(0, 8)} pid=${liveBeforeStop ?? 'none'} prior-exited-count=${priorExitedCount}`);
         }
         const outcome = await stopSession({
+            brandSlug: deps.brandSlug,
             killGraceMs: deps.killGraceMs,
             logger: deps.logger,
             runSystemctl: deps.runSystemctl,
@@ -2633,7 +2655,7 @@ export function buildHttpApp(deps) {
         for (const row of deps.watcher.all()) {
             if (row.status !== 'detached' || seen.has(row.sessionId) || !row.scopeUnitToken)
                 continue;
-            const mainPid = getScopeMainPid(runSystemctl, row.scopeUnitToken);
+            const mainPid = getScopeMainPid(runSystemctl, deps.brandSlug, row.scopeUnitToken);
             if (mainPid !== null && defaultProcessSignals.isAlive(mainPid))
                 seen.set(row.sessionId, mainPid);
         }
@@ -2950,6 +2972,7 @@ export function buildHttpApp(deps) {
                 // idempotent branch returns without recoverOutcome).
                 deps.logger(`[rc-spawn] op=recover-respawn sessionId=${sessionId.slice(0, 8)} reason=wedged`);
                 await stopSession({
+                    brandSlug: deps.brandSlug,
                     killGraceMs: deps.killGraceMs,
                     logger: deps.logger,
                     runSystemctl: deps.runSystemctl,
@@ -2976,6 +2999,7 @@ export function buildHttpApp(deps) {
             if (detached && detached.status === 'detached' && detached.scopeUnitToken) {
                 deps.logger(`[rc-spawn] op=reconcile-stop-survivor sessionId=${sessionId.slice(0, 8)} unitToken=${detached.scopeUnitToken}`);
                 await stopSession({
+                    brandSlug: deps.brandSlug,
                     killGraceMs: deps.killGraceMs,
                     logger: deps.logger,
                     runSystemctl: deps.runSystemctl,
@@ -2993,9 +3017,47 @@ export function buildHttpApp(deps) {
         // Task 969 — the new-session picker's model/effort apply only to a genuinely
         // fresh ADMIN spawn (the /chat popover posts role:'admin'). Gating on the
         // admin role as well as freshness keeps any other fresh spawn (LinkedIn
-        // ingest, public, specialist, channel cold-start) on the settings defaults
-        // even if a future caller were to put model/effort on its body.
+        // ingest, specialist, channel cold-start) on the settings defaults even if
+        // a future caller were to put model/effort on its body.
+        // Task 2452 — `public` left that list. A public spawn no longer takes the
+        // settings default model; it resolves one from its own agent below. Its
+        // EFFORT is still the settings default, so this gate is unchanged.
         const freshAdminLevers = mode === 'fresh' && rcRole === 'admin';
+        // Task 2452 — the model a public spawn runs under. Commit 725731df9 routed
+        // public Telegram to this door, which pushes --model only for the two admin
+        // shapes below, so a visitor's session silently took settings.json — pinned
+        // to Opus for the ADMIN session by the rc-daemon.
+        //
+        // Gated on the BODY role, not `effectiveRcRole`: that resolves ~180 lines
+        // below, after the argv push this feeds. Both callers that reach this door
+        // with role:'public' — Telegram (telegram-ensure-session.ts) and a slugless
+        // WhatsApp public inbound (server/index.ts, the no-enabled-agent
+        // fall-through) — put `role` in the body on every spawn, fresh and resume
+        // alike, so the body role covers every public spawn that arrives here. A
+        // channel-bound resume carrying no role at all is not covered; no public
+        // caller produces that shape.
+        //
+        // A re-seat fork is excluded, which Task 2452 states as a scope boundary
+        // and the argv shape enforces anyway: a fork takes the `forkArgvSegment`
+        // branch below, which pushes its own caller-picked `--model`, so the public
+        // push never runs for one. Resolving here regardless would make
+        // `effectiveRcModel` and `op=public-model-assert` report the agent's
+        // config.json model for a session whose command carries the re-seat model —
+        // a false green on the surface this task added to catch false greens.
+        const publicModel = rcRole === 'public' && forkFromSessionId === null
+            ? resolvePublicSpawnModel(effectiveAccountDir, rcAgentSlug)
+            : null;
+        if (publicModel?.rejected) {
+            // An operator wrote a model id that is not selectable. Emitted before the
+            // resolution line so the pair reads as cause then consequence.
+            deps.logger(`[rc-spawn] op=public-model-rejected sessionId=${sessionId ? sessionId.slice(0, 8) : 'new'} value=${publicModel.rejected.value} from=${publicModel.rejected.from} reason=not-selectable`);
+        }
+        if (publicModel) {
+            // Emitted on EVERY public spawn, including the one that resolves nothing:
+            // `source=settings` is a positive line rather than a silence, which is
+            // exactly what this failure had for a day.
+            deps.logger(`[rc-spawn] op=public-model sessionId=${sessionId ? sessionId.slice(0, 8) : 'new'} slug=${rcAgentSlug ?? 'none'} resolved=${publicModel.model ?? 'none'} source=${publicModel.source}`);
+        }
         // Task 1392 — resolve whether this spawn runs under the WhatsApp Sonnet-5/max
         // override, for BOTH the argv and the reported launch params below. Only
         // sessions BORN under the override adopt it, so an existing Opus-born WhatsApp
@@ -3052,6 +3114,12 @@ export function buildHttpApp(deps) {
             // (reseatModel null) leaves the settings.json default model in force.
             if (whatsappSonnetSpawn)
                 argv.push('--model', WHATSAPP_ADMIN_MODEL);
+            // Task 2452 — a public spawn carries its agent's own model. The three
+            // gates are mutually exclusive: both admin arms require rcRole==='admin'
+            // (whatsappSonnetSpawn on the fresh branch, freshAdminLevers always), so
+            // ordering here carries no precedence decision.
+            else if (publicModel?.model)
+                argv.push('--model', publicModel.model);
             else if (freshAdminLevers && reseatModel)
                 argv.push('--model', reseatModel);
         }
@@ -3269,6 +3337,11 @@ export function buildHttpApp(deps) {
                     nodeBin: deps.nodeBin,
                     // Task 2290 — the account the gateway keys this session's hub entry on.
                     accountId: effectiveAccountId,
+                    // Task 2458 — the body role, same value and same bridging as the
+                    // telegram sibling below. The gateway branches this session's turn-end
+                    // delivery on it, so a public visitor's answer goes back down the
+                    // posting key instead of into the admin identity fan-out.
+                    role: rcRole ?? undefined,
                     // Task 2356 — the spawn-tee inputs, so this server's stderr lands in
                     // logs/mcp-whatsapp-channel-<sessionId>.log.
                     platformRoot: deps.platformRoot,
@@ -3661,11 +3734,18 @@ export function buildHttpApp(deps) {
         // Task 969 — a fresh new-session spawn carrying picked levers runs under
         // them too (not just a fork), so the sidecar + lifeline + the /chat params
         // row report the model/effort the session actually launched on.
+        // Task 2452 — a public spawn's resolved model, so the op=argv line, the
+        // classification sidecar and the lifeline name the model the session
+        // actually launched on instead of the settings default it no longer uses.
+        // Null model (nothing declared) falls through to the settings read, which
+        // is what that spawn genuinely runs under.
         const effectiveRcModel = whatsappSonnetSpawn
             ? WHATSAPP_ADMIN_MODEL
-            : (forkFromSessionId !== null || freshAdminLevers) && reseatModel
-                ? reseatModel
-                : resolveSettingsModel(deps.claudeConfigDir);
+            : publicModel?.model
+                ? publicModel.model
+                : (forkFromSessionId !== null || freshAdminLevers) && reseatModel
+                    ? reseatModel
+                    : resolveSettingsModel(deps.claudeConfigDir);
         // Task 970 — the fork path reports its 4-level effort; the fresh path reports
         // its 5-level pick (incl. `max`). Falls back to the settings-resolved effort
         // when neither path carries one (absent on a fork, invalid/absent on a fresh).
@@ -3723,6 +3803,15 @@ export function buildHttpApp(deps) {
                 .split(',')
                 .filter((t) => t.length > 0).length,
         }));
+        // Task 2452 — argv is final here. A resolved model that never reached the
+        // command is the 725731df9 regression class, and it is invisible on every
+        // other surface: the resolution line still reads healthy, the spawn still
+        // succeeds, and only the session's own JSONL says which model it ran. This
+        // pair (`resolved` non-none with `argvHasModel=false`) is that state,
+        // greppable without a repro.
+        if (publicModel) {
+            deps.logger(`[rc-spawn] op=public-model-assert sessionId=${sessionId ? sessionId.slice(0, 8) : 'new'} resolved=${publicModel.model ?? 'none'} argvHasModel=${argv.includes('--model')}`);
+        }
         deps.logger(`[rc-spawn] op=argv unitToken=${unitToken} cwd=${effectiveAccountDir} permissionMode=${effectiveRcPermissionMode} model=${effectiveRcModel ?? 'unset'} effort=${effectiveRcEffort ?? 'unset'} positionalBytes=${positionalBytes} voiceBytes=${voiceBytes} argv=${JSON.stringify([deps.claudeBin, ...argv])}`);
         emitRcLife(deps.logger, 'argv', 'rc-spawn', 'node-pty', rcLifeMode, unitToken, {
             cwd: effectiveAccountDir,
@@ -3730,6 +3819,12 @@ export function buildHttpApp(deps) {
         });
         let pty;
         try {
+            // Task 2460 — this door passed the account's specialists nowhere at all,
+            // and it is the door the reported dispatch failure came through. Sync
+            // against the request's own account dir, which /public-spawn re-scopes
+            // per request, so a re-scoped spawn never writes the boot account's
+            // registry.
+            syncAccountAgentRegistry(effectiveAccountDir, deps.logger);
             pty = deps.spawnPty(deps.claudeBin, argv, env, effectiveAccountDir, unitToken);
         }
         catch (err) {
@@ -4067,10 +4162,21 @@ export function buildHttpApp(deps) {
                     const jsonlPath = jsonlPathForSessionId(effectiveAccountDir, sessionId);
                     if (tailIsOpenTurn(jsonlPath)) {
                         deps.logger(`[rc-life] op=turn-aborted sessionId=${sessionId.slice(0, 8)} reason=child-exit-mid-turn`);
-                        appendTurnAbortTerminator(jsonlPath, sessionId);
+                        // Task 2457 — the child was terminated, not interrupted. Record that
+                        // in the transcript: the CLI's own line blames the operator, and it
+                        // is the only thing a later --resume would otherwise read.
+                        appendTurnAbortTerminator(jsonlPath, sessionId, {
+                            exitCode: e.exitCode ?? null,
+                            unit: scopeUnitName(deps.brandSlug, unitToken),
+                        });
                     }
                 }
-                catch { /* exit path must never throw */ }
+                catch (err) {
+                    // Task 2457 — the exit path still must never throw, but a swallowed
+                    // error here means the transcript keeps the CLI's operator-interrupt
+                    // line as its only account of the kill. Say why.
+                    deps.logger(`[rc-life] op=turn-abort-record-failed sessionId=${sessionId.slice(0, 8)} err=${JSON.stringify(err instanceof Error ? err.message : String(err))}`);
+                }
             }
             // Task 977 — close the per-session child log on exit.
             childLog.close();
@@ -4240,6 +4346,7 @@ export function buildHttpApp(deps) {
                 const source = deps.watcher.getBySessionId(forkFromSessionId);
                 if (source && source.scopeUnitToken) {
                     await stopSession({
+                        brandSlug: deps.brandSlug,
                         killGraceMs: deps.killGraceMs,
                         logger: deps.logger,
                         runSystemctl: deps.runSystemctl,