gestalt-mobile 0.41.2 → 0.42.0

package/dist/client/index.html

@@ -16,7 +16,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
     <link rel="icon" href="/icons/gestalt-mobile-192.png" />
     <link rel="apple-touch-icon" href="/icons/gestalt-mobile-180.png" />
     <title>Gestalt Mobile</title>
-    <script type="module" crossorigin src="/assets/index-9uZwieND.js"></script>
+    <script type="module" crossorigin src="/assets/index-BRly-q56.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-D57mr3B1.css">
   </head>
   <body>

package/dist/server/server/cli.js

@@ -15,8 +15,11 @@ import { CliUsageError, parseConfig } from './config.js';
 import { LauncherProfileCatalog } from './platform/catalog/launcher-profile-catalog.js';
 import { FilesystemSkillProfileStore } from './platform/skills/filesystem-skill-profile-store.js';
 import { loadPwaIcon } from './platform/pwa/load-pwa-icon.js';
+import { exportControlPlaneTrace, formatControlPlaneTrace, } from './features/control-plane-trace/export-trace.js';
+import { relayStatePath } from './platform/persistence/state-path.js';
 const runFile = promisify(execFile);
 export const usage = `Usage: gestalt-mobile [options]
+       gestalt-mobile trace <session-id> [--json] [--cwd <path>] [--data-dir <path>]
 
 Options:
   --cwd <path>       Workspace root (default: current directory)
@@ -125,6 +128,33 @@ export function installShutdownHandlers(app, signalSource = process) {
     return shutdown;
 }
 function parseInvocation(args, cwd) {
+    if (args[0] === 'trace') {
+        const sessionId = args[1];
+        if (!sessionId || sessionId.startsWith('--'))
+            throw new CliUsageError('trace requires a session ID');
+        let json = false;
+        let root = cwd;
+        let dataDir;
+        for (let index = 2; index < args.length; index += 1) {
+            const option = args[index];
+            if (option === '--json') {
+                if (json)
+                    throw new CliUsageError('Duplicate option: --json');
+                json = true;
+                continue;
+            }
+            if (option !== '--cwd' && option !== '--data-dir')
+                throw new CliUsageError(`Unknown trace option: ${option}`);
+            const value = args[++index];
+            if (!value || value.startsWith('--'))
+                throw new CliUsageError(`Missing value for ${option}`);
+            if (option === '--cwd')
+                root = resolve(cwd, value);
+            else
+                dataDir = resolve(cwd, value);
+        }
+        return { command: 'trace', sessionId, json, root, ...(dataDir ? { dataDir } : {}) };
+    }
     if (args.includes('--help')) {
         if (args.length !== 1)
             throw new CliUsageError('--help cannot be combined with other arguments');
@@ -187,6 +217,23 @@ export async function runCli(dependencies = {}) {
         stdout.write(`${await packageVersion(moduleUrl)}\n`);
         return 0;
     }
+    if (invocation.command === 'trace') {
+        const stateHome = dependencies.environment?.XDG_STATE_HOME ??
+            process.env.XDG_STATE_HOME ??
+            resolve(dependencies.homeDirectory ?? homedir(), '.local/state');
+        const databasePath = invocation.dataDir
+            ? resolve(invocation.dataDir, 'relay.sqlite')
+            : relayStatePath(invocation.root, stateHome);
+        try {
+            const trace = (dependencies.exportTrace ?? exportControlPlaneTrace)(databasePath, invocation.sessionId);
+            stdout.write(invocation.json ? `${JSON.stringify(trace, null, 2)}\n` : formatControlPlaneTrace(trace));
+            return 0;
+        }
+        catch (error) {
+            stderr.write(`Unable to export control-plane trace: ${error instanceof Error ? error.message : 'unknown error'}\n`);
+            return 1;
+        }
+    }
     const skillProfiles = new FilesystemSkillProfileStore(dependencies.homeDirectory ?? homedir());
     if (invocation.command === 'list')
         return listSkillProfiles(skillProfiles, stdout, stderr);

package/dist/server/server/composition.contracts.js

@@ -12,7 +12,7 @@ import { join } from 'node:path';
 import { describe, expect, it, onTestFinished, vi } from 'vitest';
 import WebSocket from 'ws';
 import { composeRelayApp } from './composition.js';
-import { AUTOPILOT_CONTINUATION_PROMPT } from './features/autopilot/application/policy.js';
+import { autopilotExecutorLaunchPrompt } from './features/autopilot/application/policy.js';
 import { CodexJsonRpcError } from './platform/codex/json-rpc-client.js';
 import { SqliteAuthorizationStore } from './platform/auth/sqlite-authorization-store.js';
 import { authorizationSessionId, authorizedDeviceId, localOwnerId, webAuthnCredentialId, } from './features/auth/domain/identifiers.js';
@@ -497,7 +497,12 @@ describe('production composition', () => {
                 input: [
                     {
                         type: 'text',
-                        text: `${AUTOPILOT_CONTINUATION_PROMPT} Launch task_name l1 for canonical L1; retain the canonical label in status and review output.`,
+                        text: autopilotExecutorLaunchPrompt({
+                            canonicalTaskName: 'l1',
+                            canonicalPosition: 'L1',
+                            generation: 1,
+                            taskName: 'l1',
+                        }),
                         text_elements: [],
                     },
                 ],
@@ -1040,6 +1045,16 @@ describe('production composition', () => {
             await expect
                 .poll(async () => (await fixture.app.inject(`/api/sessions/${fixture.sessionId}`)).json().activeTurnId)
                 .toBeNull();
+            await expect
+                .poll(() => {
+                const database = new DatabaseSync(join(fixture.dataDir, 'relay.sqlite'));
+                const scheduled = database
+                    .prepare("SELECT count(*) AS count FROM session_events WHERE session_id = ? AND type = 'autopilot.continuation-scheduled'")
+                    .get(fixture.sessionId);
+                database.close();
+                return scheduled.count;
+            })
+                .toBeGreaterThan(0);
             const startedTurns = () => fixture.handles
                 .flatMap((candidate) => candidate.requests)
                 .filter((request) => request.method === 'turn/start').length;
@@ -1455,7 +1470,7 @@ describe('production composition', () => {
                 .filter((request) => request.method === 'turn/start')).toHaveLength(startsAfterFinal);
             await fixture.app.close();
         });
-        it('production attention request requires explicit re-enable and a complete plan transitions to completed', async () => {
+        it('production attention approval resumes Autopilot and a complete plan transitions to completed', async () => {
             const fixture = await createProductionAutopilotFixture();
             const handle = fixture.handles.find((candidate) => candidate.request);
             expect((await fixture.app.inject({
@@ -1474,15 +1489,6 @@ describe('production composition', () => {
                 url: `/api/sessions/${fixture.sessionId}/attention/810/resolve`,
                 payload: { operationKey: 'resume-attention', action: 'resume' },
             })).statusCode).toBe(202);
-            await new Promise((resolve) => setTimeout(resolve, 25));
-            expect((await fixture.app.inject(`/api/sessions/${fixture.sessionId}`)).json()).toMatchObject({
-                autopilot: { state: 'attentionRequired', enabled: false },
-            });
-            expect((await fixture.app.inject({
-                method: 'PUT',
-                url: `/api/sessions/${fixture.sessionId}/autopilot`,
-                payload: { enabled: true },
-            })).statusCode).toBe(200);
             await vi.waitFor(async () => expect((await fixture.app.inject(`/api/sessions/${fixture.sessionId}`)).json()).toMatchObject({
                 autopilot: { enabled: true, state: expect.stringMatching(/monitoring|backoff/) },
             }));
@@ -1615,8 +1621,14 @@ describe('production composition', () => {
             handle.notify(completion);
             handle.notify(completion);
             await vi.waitFor(() => expect(timers.filter((timer) => !timer.cancelled && !timer.fired)).toHaveLength(1));
-            await runNextTimer();
-            await runNextTimer();
+            for (let attempts = 0; attempts < 3; attempts += 1) {
+                const pending = timers.find((timer) => !timer.cancelled && !timer.fired);
+                if (!pending)
+                    break;
+                pending.fired = true;
+                pending.callback();
+                await Promise.resolve();
+            }
             await vi.waitFor(() => expect(fixture.handles
                 .flatMap((candidate) => candidate.calls)
                 .filter((call) => call === 'turn/start')).toHaveLength(2), { timeout: 3_500 });
@@ -1770,7 +1782,7 @@ describe('production composition', () => {
             // rejected child continuation; it must never target the dead child.
             expect((starts[3]?.params).threadId).not.toBe('child-1');
             expect((starts[3]?.params).input?.[0]?.text).toContain('Launch task_name l1_g2 for canonical L1');
-            expect((starts[3]?.params).input?.[0]?.text).toContain('explicit model selected by the supervisor');
+            expect((starts[3]?.params).input?.[0]?.text).toContain('agent_type org-plan-executor and reasoning_effort high');
             // Capacity recovery is allowed only for the active root control. It
             // recycles that writer but must retain the one durable g2 handoff.
             const rootHandle = fixture.handles.find((candidate) => candidate.requests.some((request) => request.method === 'turn/start' &&

package/dist/server/server/composition.js

@@ -66,7 +66,7 @@ import { AutopilotCoordinator } from './features/autopilot/application/service.j
 import { deriveSessionStatus } from './features/sessions/session-status.js';
 import { AUTOPILOT_CONTINUATION_PROMPT, AUTOPILOT_EXECUTOR_CONTINUATION_PROMPT, autopilotExecutorLaunchPrompt, defaultAutopilotPolicy, } from './features/autopilot/application/policy.js';
 import { createRelyingPartyConfig } from './config.js';
-import { parseOrgPlanAttention, toOrgPlanAttentionAcknowledgement, } from '../shared/contracts/org-plan-attention.js';
+import { parseOrgPlanAttention, parseOrgPlanAttentionToolResponse, toOrgPlanAttentionAcknowledgement, } from '../shared/contracts/org-plan-attention.js';
 import { autopilotWaitLeaseToolResponse, } from '../shared/contracts/autopilot-wait-lease.js';
 import { agentCapacityRecoveryToolResponse } from '../shared/contracts/agent-capacity-recovery.js';
 import { pwaIconUrl } from './features/pwa/register-routes.js';
@@ -137,7 +137,14 @@ export async function composeRelayApp(options) {
     };
     options.onAttentionTransitions?.(attentionTransitions);
     const activity = new AgentActivityRegistry((snapshot, occurredAt) => {
-        events.publish(journal.append(snapshot.sessionId, 'agent.activity.updated', toAgentActivityDto(snapshot), occurredAt));
+        events.publish(journal.append(snapshot.sessionId, 'agent.activity.updated', {
+            ...toAgentActivityDto(snapshot),
+            ...(autopilotStore.find(snapshot.sessionId)?.checkpoints?.activeHandoffId
+                ? {
+                    traceId: autopilotStore.find(snapshot.sessionId).checkpoints.activeHandoffId,
+                }
+                : {}),
+        }, occurredAt));
         publishSessionStatus(snapshot.sessionId, occurredAt);
         notifyAutopilotActivity(snapshot.sessionId);
     }, {
@@ -400,8 +407,6 @@ export async function composeRelayApp(options) {
                 explicit: session.effectiveSkillSelection.skills,
             }).skillsConfig;
         const project = await skillProfiles.readWorkspaceDefault(session.workspacePath);
-        if (!options.explicitSkillProfile && !project)
-            return undefined;
         return compileSkillOverride({
             discovered: catalog.skills,
             explicit: options.explicitSkillProfile?.skills,
@@ -498,7 +503,13 @@ export async function composeRelayApp(options) {
         if (!interactions.resolve(sessionId, requestId, occurredAt, 'failed'))
             return false;
         autopilot.checkpointHandoffFailed(sessionId, turnId);
-        events.publish(journal.append(sessionId, 'org-plan.checkpoint-handoff-failed', { requestId, reason: 'checkpointHandoffFailed' }, occurredAt));
+        events.publish(journal.append(sessionId, 'org-plan.checkpoint-handoff-failed', {
+            requestId,
+            reason: 'checkpointHandoffFailed',
+            ...(autopilotStore.find(sessionId)?.checkpoints?.activeHandoffId
+                ? { traceId: autopilotStore.find(sessionId).checkpoints.activeHandoffId }
+                : {}),
+        }, occurredAt));
         publishAttentionSettlement(sessionId, requestId, occurredAt, 'failed');
         // Neither this timeout nor a failed transport may schedule continuation.
         // If a successful response is already blocked in the writable stream, drop
@@ -698,9 +709,16 @@ export async function composeRelayApp(options) {
             const rootCommandId = resolvedOrigin.kind === 'root' ? completedCommandId(notification) : null;
             if (rootCommandId)
                 autopilot.rootProcessCompleted(sessionId, rootCommandId);
+            const refreshChildTopology = notification.method === 'item/completed' &&
+                activityFacts.some((fact) => fact.kind === 'collaboration' &&
+                    (fact.collaborationAction === 'spawn_agent' ||
+                        fact.collaborationAction === 'resume_agent' ||
+                        fact.collaborationAction === 'close_agent'));
             if (!normalized) {
                 for (const activityFact of activityFacts)
                     activity.observe(activityFact);
+                if (refreshChildTopology)
+                    void activity.refresh(sessionId);
                 return;
             }
             let completedSession;
@@ -719,6 +737,19 @@ export async function composeRelayApp(options) {
             // activeTurnId while the completion fact makes the root appear idle.
             for (const activityFact of activityFacts)
                 activity.observe(activityFact);
+            // Re-evaluate once both halves of the safe continuation boundary are
+            // observable. turnCompleted() releases the durable checkpoint before
+            // these facts project the idle root; its first evaluation can therefore
+            // still see the pre-completion activity snapshot. This second evaluation
+            // is idempotently fenced by the durable control row.
+            if (completedSession)
+                autopilot.evaluate(sessionId);
+            // Lifecycle notifications are fast transition evidence, while
+            // thread/list is the bounded topology authority. Reconcile after the
+            // mutation so canonical identity and every retained child reach both
+            // the GUI and Autopilot even when the notification is sparse.
+            if (refreshChildTopology)
+                void activity.refresh(sessionId);
             events.publish(journal.append(sessionId, normalized.type, normalized.payload, normalized.occurredAt));
             if (completedSession)
                 events.publish(journal.append(sessionId, 'session.updated', completedSession, occurredAt));
@@ -1433,6 +1464,10 @@ export async function composeRelayApp(options) {
                             const interaction = interactions.find(sessionId, requestId);
                             if (!interaction || interaction.kind !== 'orgPlanAttention')
                                 return { kind: 'noActive' };
+                            const decision = parseOrgPlanAttentionToolResponse(response);
+                            const attention = parseOrgPlanAttention(interaction.payload);
+                            if (!decision || !attention)
+                                return { kind: 'staleOperation' };
                             const claim = interactions.claimOperation(sessionId, requestId, operationKey);
                             if (claim === 'resolved') {
                                 const resolved = interactions.resolved(sessionId, requestId);
@@ -1448,12 +1483,23 @@ export async function composeRelayApp(options) {
                             if (acknowledged) {
                                 if (!interactions.beginDelivery(sessionId, requestId, operationKey))
                                     return { kind: 'staleOperation' };
+                                if (decision.action === 'resume' && attention.executorReplacement) {
+                                    const authorization = autopilot.authorizeExecutorReplacement(sessionId, attention.executorReplacement.canonicalTaskName);
+                                    if (!authorization.accepted) {
+                                        interactions.retryDelivery(sessionId, requestId, operationKey);
+                                        return { kind: 'replacementRejected' };
+                                    }
+                                }
                                 const resolvedAt = new Date().toISOString();
                                 if (!interactions.settleOperation(sessionId, requestId, operationKey, resolvedAt, 'answered'))
                                     return { kind: 'staleOperation' };
                                 const accepted = { kind: 'accepted', resolvedAt };
                                 idempotency.put(scope, operationKey, 202, JSON.stringify({ kind: 'replayed', resolvedAt }));
                                 publishAttentionSettlement(sessionId, requestId, resolvedAt, 'answered');
+                                if (decision.action === 'disableAutopilot')
+                                    autopilot.disable(sessionId);
+                                else
+                                    autopilot.enable(sessionId);
                                 return accepted;
                             }
                             // A durable capability belongs to the session/thread, not the
@@ -1465,6 +1511,13 @@ export async function composeRelayApp(options) {
                                 return { kind: 'writerUnavailable' };
                             if (!interactions.beginDelivery(sessionId, requestId, operationKey))
                                 return { kind: 'staleOperation' };
+                            if (decision.action === 'resume' && attention.executorReplacement) {
+                                const authorization = autopilot.authorizeExecutorReplacement(sessionId, attention.executorReplacement.canonicalTaskName);
+                                if (!authorization.accepted) {
+                                    interactions.retryDelivery(sessionId, requestId, operationKey);
+                                    return { kind: 'replacementRejected' };
+                                }
+                            }
                             const writer = runtime.attentionWriterState(sessionId, requestId);
                             if (writer === 'unavailable') {
                                 interactions.retryDelivery(sessionId, requestId, operationKey);
@@ -1488,6 +1541,10 @@ export async function composeRelayApp(options) {
                             const accepted = { kind: 'accepted', resolvedAt };
                             idempotency.put(scope, operationKey, 202, JSON.stringify({ kind: 'replayed', resolvedAt }));
                             publishAttentionSettlement(sessionId, requestId, resolvedAt, 'answered');
+                            if (decision.action === 'disableAutopilot')
+                                autopilot.disable(sessionId);
+                            else
+                                autopilot.enable(sessionId);
                             return accepted;
                         })();
                         attentionResolutionOperations.set(key, operation);

package/dist/server/server/features/agent-activity/model.js

@@ -196,6 +196,14 @@ function childOutcome(status, action, previous) {
         return 'cancelled';
     if (status === 'completed' || status === 'idle')
         return 'partial';
+    // A follow-up reopens the same physical child. Do not keep presenting its
+    // previous boundary completion while its new turn is running.
+    if (action === 'resume_agent' ||
+        status === 'working' ||
+        status === 'active' ||
+        status === 'running' ||
+        status === 'pendingInit')
+        return undefined;
     return previous;
 }
 function childState(status, action, previous = 'working') {

package/dist/server/server/features/autopilot/application/policy.js

@@ -3,15 +3,15 @@
  * Designed by Denis Roio <jaromil@dyne.org>
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-export const AUTOPILOT_PROMPT_VERSION = 'v11';
-export const AUTOPILOT_CONTINUATION_PROMPT = 'Inspect the active supervised Org Plan. Refer to every L1 as L<a> and each nested L2 as L<a>.<b>, using one-based positions. Spawn exactly one executor per L1 and pass the exact literal task_name l<a>: l1 for L1, l2 for L2, and so on. Never create an L2-specific task name or append a title, role, nickname, plan name, or generated label. A validated DONE L2 and an accepted L1 are mandatory answer boundaries. The corresponding gestalt_org_plan_checkpoint call must be the last tool call of that root turn: immediately emit exactly one boundary final and end the turn, without followup_task, review, executor launch, or later milestone work. Roll up commentary, files, verification, and commands since the previous boundary into that one answer; all later milestone activity belongs to a new root turn. On this later Autopilot turn, resume the same executor after an L2 boundary or launch the next executor after an accepted-L1 boundary. Treat a status question as an interruption: answer briefly, then perform the applicable continuation in the same turn. Before sending any blocker response or yielding because progress cannot continue safely, call gestalt_org_plan_attention for the matching decision-table blocker; never rely on blocker prose as the signal. Do not call it for routine progress or a recoverable failure. Before yielding for known long work, call gestalt_autopilot_wait_lease version 2 with relevant observable wake conditions and a bounded maxWaitMs; it is one episode, so reassess before registering another in a later turn. Yield only when its response contains accepted:true; accepted:false means no continuation was registered and requires same-turn supervision. For GitHub PR CI, start an owned gh pr checks --watch process and lease processExited plus processResultAvailable while it runs. When the Autopilot probe is active, register the compatible wait lease, declare genuine attention, or immediately do actionable work; never acknowledge waiting in prose. Do not send a status-only response.';
+export const AUTOPILOT_PROMPT_VERSION = 'v13';
+export const AUTOPILOT_CONTINUATION_PROMPT = 'Inspect the active supervised Org Plan. Refer to every L1 as L<a> and each nested L2 as L<a>.<b>, using one-based positions. Spawn exactly one executor per L1 and pass the exact literal task_name l<a>: l1 for L1, l2 for L2, and so on. Never create an L2-specific task name or append a title, role, nickname, plan name, or generated label. A validated DONE L2 and an accepted L1 are mandatory answer boundaries. The corresponding gestalt_org_plan_checkpoint call must be the last tool call of that root turn: immediately emit exactly one boundary final and end the turn, without followup_task, review, executor launch, or later milestone work. An accepted L1 always ends the root turn with a chat answer: never continue into the next L1 or emit post-acceptance documentation as commentary. Roll up commentary, files, verification, and commands since the previous boundary into that one answer; all later milestone activity belongs to a new root turn. On this later Autopilot turn, resume the same executor after an L2 boundary or launch exactly one fresh canonical executor for the next L1 after an accepted-L1 boundary. Treat a status question as an interruption: answer briefly, then perform the applicable continuation in the same turn. Before sending any blocker response or yielding because progress cannot continue safely, call gestalt_org_plan_attention for the matching decision-table blocker; never rely on blocker prose as the signal. When explicit human permission is required for a physical executor replacement, include executorReplacement with the exact canonicalTaskName; Mobile alone computes and persists the physical generation. Do not call attention for routine progress or a recoverable failure. Before yielding for known long work, call gestalt_autopilot_wait_lease version 2 with relevant observable wake conditions and a bounded maxWaitMs; it is one episode, so reassess before registering another in a later turn. Yield only when its response contains accepted:true; accepted:false means no continuation was registered and requires same-turn supervision. For GitHub PR CI, start an owned gh pr checks --watch process and lease processExited plus processResultAvailable while it runs. When the Autopilot probe is active, register the compatible wait lease, declare genuine attention, or immediately do actionable work; never acknowledge waiting in prose. Do not send a status-only response.';
 export const AUTOPILOT_EXECUTOR_CONTINUATION_PROMPT = 'Continue the same assigned Org L1 from its durable state. A prior turn ending did not complete the objective. Consume any supplied process result and take the next legal L2 action. Whenever an L2 reaches DONE, return its concise structured evidence and end the executor turn so the root can publish that mandatory answer boundary. Also report at the L1 review boundary or through structured attention.';
 /** Builds a physical launch instruction while keeping durable L1 identity canonical. */
 export function autopilotExecutorLaunchPrompt(identity) {
-    const launch = `Launch task_name ${identity.taskName} for canonical ${identity.canonicalPosition}; retain the canonical label in status and review output.`;
+    const launch = `Launch task_name ${identity.taskName} for canonical ${identity.canonicalPosition} with agent_type org-plan-executor and reasoning_effort high; the profile selects gpt-5.6-terra by default, so do not override its model. Retain the canonical label in status and review output.`;
     if (identity.generation === 1)
         return `${AUTOPILOT_CONTINUATION_PROMPT} ${launch}`;
-    return `${AUTOPILOT_CONTINUATION_PROMPT} ${launch} This exact replacement generation ${identity.generation} is durably authorized by Mobile; do not infer another generation from this prompt or the roster; the durable ${identity.canonicalTaskName} slot may remain reserved. Do not reuse that task_name or attempt to change an existing agent's model in place. Interrupt the previous physical executor if it is still running, then spawn ${identity.taskName} with agent_type worker and an explicit model selected by the supervisor. Transfer sole ${identity.canonicalPosition} ownership and continue from its durable Org Plan and worktree state.`;
+    return `${AUTOPILOT_CONTINUATION_PROMPT} ${launch} This exact replacement generation ${identity.generation} is durably authorized by Mobile; do not infer another generation from this prompt or the roster; the durable ${identity.canonicalTaskName} slot may remain reserved. Do not reuse that task_name or attempt to change an existing agent's model in place. Interrupt the previous physical executor if it is still running, then spawn the authorized ${identity.taskName}. Transfer sole ${identity.canonicalPosition} ownership and continue from its durable Org Plan and worktree state.`;
 }
 export const defaultAutopilotPolicy = Object.freeze({
     quiescenceMs: 1_000,