@karmaniverous/jeeves-meta 0.15.11 → 0.16.0

package/README.md

@@ -66,7 +66,7 @@ jeeves-meta service install --config /path/to/jeeves-meta/config.json
 | POST | `/config/apply` | Apply a config patch (merge or replace) |
 | GET | `/queue` | Queue state: current (with phase), overrides, automatic, pending |
 | POST | `/queue/clear` | Remove all override queue entries |
-| PATCH | `/metas/:path` | Update user-settable reserved properties (`_steer`, `_emphasis`, `_depth`, `_crossRefs`, `_disabled`, `_architectTimeout`, `_builderTimeout`, `_criticTimeout`) |
+| PATCH | `/metas/:path` | Update user-settable reserved properties (`_steer`, `_emphasis`, `_depth`, `_crossRefs`, `_disabled`) |
 
 ## Configuration
 

package/dist/bootstrap.d.ts

@@ -4,6 +4,17 @@
  * @module bootstrap
  */
 import { type ServiceConfig } from './schema/config.js';
+/**
+ * Compute per-cycle token total from a completed meta.
+ *
+ * Exported for testing.
+ *
+ * Uses `_synthesisCount` as a discriminator: after increment by `runCritic`,
+ * a value of 1 means architect ran this cycle (was 0 pre-increment),
+ * so all three phase token fields are summed. A value \> 1 means architect
+ * was skipped (cached brief reused), so only builder + critic are summed.
+ */
+export declare function computeCycleTokens(meta: Record<string, unknown>): number;
 /**
  * Bootstrap the service: create logger, build server, start listening,
  * wire scheduler, queue processing, rule registration, config hot-reload,

package/dist/cli/jeeves-meta/architect.md

@@ -128,8 +128,6 @@ The Builder should:
 4. Merge new findings with previous `_content` (carried in context)
 
 If the scope is small enough to process in one pass, omit chunking instructions.
-The Builder has a timeout of \{{config.builderTimeout}} seconds.
-
 ### 8. Output Structure
 
 Define non-underscore fields for structured data and the _content narrative
@@ -148,7 +146,6 @@ Quote the specific issue and state what to do differently.
 Your task brief will be compiled as a Handlebars template before the Builder
 receives it. You can use these variables to write adaptive instructions:
 
-- `\{{config.builderTimeout}}` — Builder timeout in seconds
 - `\{{config.maxLines}}` — Maximum _content lines
 - `\{{config.architectEvery}}` — Cycles between architect refreshes
 - `\{{config.maxArchive}}` — Archive snapshots retained
@@ -159,7 +156,7 @@ receives it. You can use these variables to write adaptive instructions:
 - `\{{meta._depth}}` — Scheduling depth
 - `\{{meta._emphasis}}` — Scheduling emphasis
 
-Example: "Process files in chunks of 50. You have \{{config.builderTimeout}} seconds."
+Example: "Process files in chunks of 50. Limit output to \{{config.maxLines}} lines."
 
 ## Constraints
 

package/dist/cli/jeeves-meta/index.js

@@ -782,12 +782,6 @@ const autoSeedRuleSchema = z.object({
     crossRefs: z.array(z.string()).optional(),
     /** Walk up this many extra parent levels from the matched file's directory. Default 0. */
     parentDepth: z.number().int().min(0).optional(),
-    /** Per-category timeout override for the architect phase (seconds, min 30). */
-    architectTimeout: z.number().int().min(30).optional(),
-    /** Per-category timeout override for the builder phase (seconds, min 30). */
-    builderTimeout: z.number().int().min(30).optional(),
-    /** Per-category timeout override for the critic phase (seconds, min 30). */
-    criticTimeout: z.number().int().min(30).optional(),
 });
 /** Zod schema for jeeves-meta service configuration (superset of MetaConfig). */
 const serviceConfigSchema = metaConfigSchema.extend({
@@ -925,7 +919,7 @@ class SpawnTimeoutError extends Error {
  * @module executor/GatewayExecutor
  */
 const DEFAULT_POLL_INTERVAL_MS = 5000;
-const DEFAULT_TIMEOUT_MS$1 = 600_000; // 10 minutes
+const DEFAULT_SAFETY_VALVE_MS = 3_600_000; // 1 hour fallback
 /**
  * MetaExecutor that spawns OpenClaw sessions via the gateway's
  * `/tools/invoke` endpoint.
@@ -956,6 +950,42 @@ class GatewayExecutor {
             /* best-effort cleanup */
         }
     }
+    /** Read and clean up the staging output file. Returns content or undefined if absent. */
+    readStagingFile(outputPath) {
+        if (!existsSync(outputPath))
+            return undefined;
+        try {
+            return readFileSync(outputPath, 'utf8');
+        }
+        finally {
+            this.cleanupOutputFile(outputPath);
+        }
+    }
+    /** Extract plain text from a message content field, skipping ANNOUNCE_SKIP sentinels. */
+    static extractMessageText(content) {
+        if (!content)
+            return undefined;
+        const text = typeof content === 'string'
+            ? content
+            : Array.isArray(content)
+                ? content
+                    .filter((b) => b.type === 'text' && b.text)
+                    .map((b) => b.text)
+                    .join('\n')
+                : '';
+        return text && text.trim() !== 'ANNOUNCE_SKIP' ? text : undefined;
+    }
+    /** Check history messages for terminal completion. */
+    static checkHistoryCompletion(messages) {
+        if (messages.length === 0)
+            return { done: false, timedOut: false };
+        const last = messages[messages.length - 1];
+        if (last.role !== 'assistant' || !last.stopReason)
+            return { done: false, timedOut: false };
+        if (last.stopReason === 'toolUse' || last.stopReason === 'error')
+            return { done: false, timedOut: false };
+        return { done: true, timedOut: last.stopReason === 'timeout' };
+    }
     /** Invoke a gateway tool via the /tools/invoke HTTP endpoint. */
     async invoke(tool, args, sessionKey) {
         const headers = {
@@ -982,7 +1012,13 @@ class GatewayExecutor {
         }
         return data;
     }
-    /** Look up session metadata (tokens, completion status) via sessions_list. */
+    /**
+     * Look up session metadata (tokens, completion status) via sessions_list.
+     *
+     * Detects gateway-side timeout (`status: "timeout"`) and killed sessions
+     * (`status: "killed"`) as completed, with a `timedOut` flag to distinguish
+     * timeout from normal completion.
+     */
     async getSessionInfo(sessionKey) {
         try {
             const result = await this.invoke('sessions_list', {
@@ -998,13 +1034,18 @@ class GatewayExecutor {
                 // With limit=200 this is reliable; a false positive here only
                 // means we read the output file slightly early (still correct
                 // if the file exists).
-                return { completed: true };
+                return { completed: true, timedOut: false };
             }
-            const done = match.status === 'completed' || match.status === 'done';
-            return { tokens: match.totalTokens, completed: done };
+            const status = match.status;
+            const done = status === 'completed' ||
+                status === 'done' ||
+                status === 'timeout' ||
+                status === 'killed';
+            const timedOut = status === 'timeout';
+            return { tokens: match.totalTokens, completed: done, timedOut };
         }
         catch {
-            return { completed: false };
+            return { completed: false, timedOut: false };
         }
     }
     /** Whether this executor has been aborted by the operator. */
@@ -1015,12 +1056,38 @@ class GatewayExecutor {
     abort() {
         this.controller.abort();
     }
+    /**
+     * Query the gateway's configured subagent run timeout.
+     *
+     * Returns the value in milliseconds, or `undefined` if the query fails
+     * or the value is absent/zero (no timeout configured).
+     */
+    async queryGatewayRunTimeout() {
+        try {
+            const result = await this.invoke('session_status', {});
+            const details = (result.result?.details ?? result.result ?? {});
+            const runTimeoutSeconds = details.runTimeoutSeconds ??
+                details.timeout;
+            if (typeof runTimeoutSeconds === 'number' && runTimeoutSeconds > 0) {
+                return runTimeoutSeconds * 1000;
+            }
+        }
+        catch {
+            // Gateway unreachable or field not exposed — fall back to default
+        }
+        return undefined;
+    }
     async spawn(task, options) {
         // Fresh controller for each spawn call
         this.controller = new AbortController();
-        const timeoutSeconds = options?.timeout ?? DEFAULT_TIMEOUT_MS$1 / 1000;
-        const timeoutMs = timeoutSeconds * 1000;
-        const deadline = Date.now() + timeoutMs;
+        // Safety-valve deadline: gateway's runTimeoutSeconds + 60s buffer,
+        // defaulting to 1 hour if the gateway value is 0/absent/query fails.
+        // This is a circuit breaker, not a timeout mechanism.
+        const gatewayTimeoutMs = await this.queryGatewayRunTimeout();
+        const safetyValveMs = gatewayTimeoutMs
+            ? gatewayTimeoutMs + 60_000
+            : DEFAULT_SAFETY_VALVE_MS;
+        const safetyDeadline = Date.now() + safetyValveMs;
         // Ensure workspace dir exists
         if (!existsSync(this.workspaceDir)) {
             mkdirSync(this.workspaceDir, { recursive: true });
@@ -1042,7 +1109,6 @@ class GatewayExecutor {
         const spawnResult = await this.invoke('sessions_spawn', {
             task: taskWithOutput,
             label,
-            runTimeoutSeconds: timeoutSeconds,
             ...(options?.thinking ? { thinking: options.thinking } : {}),
             ...(options?.model ? { model: options.model } : {}),
         });
@@ -1054,9 +1120,18 @@ class GatewayExecutor {
             throw new Error('Gateway sessions_spawn returned no sessionKey: ' +
                 JSON.stringify(spawnResult));
         }
-        // Step 2: Poll for completion via sessions_history
+        // Step 2: Poll for completion — gateway owns the subagent lifecycle.
+        // Loop exits via: (a) completion detection, (b) abort signal,
+        // (c) gateway-side timeout detection, or (d) safety-valve circuit breaker.
         await sleepAsync(3000);
-        while (Date.now() < deadline) {
+        while (true) {
+            // Safety-valve circuit breaker
+            if (Date.now() >= safetyDeadline) {
+                this.cleanupOutputFile(outputPath);
+                throw new SpawnTimeoutError('Safety-valve deadline exceeded (' +
+                    safetyValveMs.toString() +
+                    'ms) — gateway timeout may be misconfigured', outputPath);
+            }
             // Check for abort before each poll iteration
             if (this.controller.signal.aborted) {
                 this.cleanupOutputFile(outputPath);
@@ -1073,62 +1148,48 @@ class GatewayExecutor {
                     [];
                 const msgArray = messages;
                 // Check 1: terminal stop reason in history
-                let historyDone = false;
-                if (msgArray.length > 0) {
-                    const lastMsg = msgArray[msgArray.length - 1];
-                    if (lastMsg.role === 'assistant' &&
-                        lastMsg.stopReason &&
-                        lastMsg.stopReason !== 'toolUse' &&
-                        lastMsg.stopReason !== 'error') {
-                        historyDone = true;
-                    }
-                }
+                const { done: historyDone, timedOut: historyTimedOut } = GatewayExecutor.checkHistoryCompletion(msgArray);
                 // Check 2: session completion status via sessions_list
                 const sessionInfo = await this.getSessionInfo(sessionKey);
+                const timedOut = sessionInfo.timedOut || historyTimedOut;
                 if (historyDone || sessionInfo.completed) {
                     const tokens = sessionInfo.tokens;
-                    // Read output from file (sub-agent wrote it via Write tool)
-                    if (existsSync(outputPath)) {
-                        try {
-                            const output = readFileSync(outputPath, 'utf8');
+                    // Gateway-side timeout detected — check staging file for recovery
+                    if (timedOut) {
+                        const output = this.readStagingFile(outputPath);
+                        if (output !== undefined)
                             return { output, tokens };
-                        }
-                        finally {
-                            try {
-                                unlinkSync(outputPath);
-                            }
-                            catch {
-                                /* cleanup best-effort */
-                            }
-                        }
+                        // No output or partial output — throw for _state recovery (§3.16.6)
+                        throw new SpawnTimeoutError('Gateway-side timeout detected (session status: timeout)', outputPath);
                     }
+                    // Normal completion — read output from file
+                    const output = this.readStagingFile(outputPath);
+                    if (output !== undefined)
+                        return { output, tokens };
                     // Fallback: extract from message content if file wasn't written.
                     // Skip ANNOUNCE_SKIP sentinel messages — the real output is in
                     // a preceding assistant message (the file write).
                     for (let i = msgArray.length - 1; i >= 0; i--) {
                         const msg = msgArray[i];
-                        if (msg.role === 'assistant' && msg.content) {
-                            const text = typeof msg.content === 'string'
-                                ? msg.content
-                                : Array.isArray(msg.content)
-                                    ? msg.content
-                                        .filter((b) => b.type === 'text' && b.text)
-                                        .map((b) => b.text)
-                                        .join('\n')
-                                    : '';
-                            if (text && text.trim() !== 'ANNOUNCE_SKIP')
+                        if (msg.role === 'assistant') {
+                            const text = GatewayExecutor.extractMessageText(msg.content);
+                            if (text !== undefined)
                                 return { output: text, tokens };
                         }
                     }
                     return { output: '', tokens };
                 }
             }
-            catch {
+            catch (err) {
+                // Re-throw SpawnTimeoutError and SpawnAbortedError — only swallow transient poll failures
+                if (err instanceof SpawnTimeoutError ||
+                    err instanceof SpawnAbortedError) {
+                    throw err;
+                }
                 // Transient poll failure — keep trying
             }
             await sleepAsync(this.pollIntervalMs);
         }
-        throw new SpawnTimeoutError('Synthesis subprocess timed out after ' + timeoutMs.toString() + 'ms', outputPath);
     }
 }
 
@@ -2337,7 +2398,7 @@ function buildPhaseCandidates(entries, architectEvery) {
         if (entry.meta._phaseState) {
             const needsArchitect = !entry.meta._builder ||
                 (entry.meta._synthesisCount ?? 0) >= architectEvery;
-            if (needsArchitect && ps.architect === 'fresh') {
+            if (needsArchitect && isFullyFresh(ps)) {
                 ps = { architect: 'pending', builder: 'stale', critic: 'stale' };
             }
         }
@@ -2573,6 +2634,9 @@ async function persistPhaseState(base, phaseState, updates) {
         _phaseState: phaseState,
         _structureHash: base.structureHash,
     };
+    if (!merged._id) {
+        merged._id = randomUUID();
+    }
     // Clean undefined
     if (merged._error === undefined)
         delete merged._error;
@@ -2623,7 +2687,6 @@ async function runArchitect(node, currentMeta, phaseState, config, executor, wat
         const architectTask = buildArchitectTask(ctx, currentMeta, config);
         const result = await executor.spawn(architectTask, {
             thinking: config.thinking,
-            timeout: currentMeta._architectTimeout ?? config.architectTimeout,
             label: 'meta-architect',
         });
         const builderBrief = parseArchitectOutput(result.output);
@@ -2675,10 +2738,35 @@ async function runBuilder(node, currentMeta, phaseState, config, executor, watch
         const builderTask = buildBuilderTask(ctx, currentMeta, config);
         const result = await executor.spawn(builderTask, {
             thinking: config.thinking,
-            timeout: currentMeta._builderTimeout ?? config.builderTimeout,
             label: 'meta-builder',
         });
-        const builderOutput = parseBuilderOutput(result.output);
+        const rawOutput = result.output;
+        // Exact match only — ANNOUNCE_SKIP as the entire output means "no update."
+        // A trailing sentinel on valid output (e.g. JSON + ANNOUNCE_SKIP) is handled
+        // by stripSentinel() inside parseBuilderOutput and is NOT a skip.
+        const isSkip = rawOutput.trim() === 'ANNOUNCE_SKIP';
+        if (isSkip) {
+            // ANNOUNCE_SKIP: preserve existing _content, bump _generatedAt only
+            ps = builderSuccess(ps);
+            const skipUpdates = {
+                _builderTokens: result.tokens,
+                _generatedAt: new Date().toISOString(),
+                _error: undefined,
+            };
+            const ancestorHash = hashAncestorBuilder(ctx.ancestorBuilder);
+            if (ancestorHash)
+                skipUpdates._ancestorBuilderHash = ancestorHash;
+            const updatedMeta = await persistPhaseState(base, ps, skipUpdates);
+            await onProgress?.({
+                type: 'phase_complete',
+                path: node.ownerPath,
+                phase: 'builder',
+                tokens: result.tokens,
+                durationMs: Date.now() - builderStart,
+            });
+            return { executed: true, phaseState: ps, updatedMeta };
+        }
+        const builderOutput = parseBuilderOutput(rawOutput);
         const builderTokens = result.tokens;
         // Builder success: builder → fresh, critic → pending
         ps = builderSuccess(ps);
@@ -2744,7 +2832,6 @@ async function runCritic(node, currentMeta, phaseState, config, executor, watche
         const criticTask = buildCriticTask(ctx, metaForCritic, config);
         const result = await executor.spawn(criticTask, {
             thinking: config.thinking,
-            timeout: currentMeta._criticTimeout ?? config.criticTimeout,
             label: 'meta-critic',
         });
         const feedback = parseCriticOutput(result.output);
@@ -2798,6 +2885,28 @@ async function runCritic(node, currentMeta, phaseState, config, executor, watche
  *
  * @module orchestrator/orchestratePhase
  */
+/**
+ * Check whether a meta has an empty scope — no source files, no children,
+ * no cross-refs, and no prior content. Matches §3.9 empty-scope criteria.
+ */
+function isEmptyScope(scopeFiles, node, meta) {
+    return (scopeFiles.length === 0 &&
+        node.children.length === 0 &&
+        (!meta._crossRefs || meta._crossRefs.length === 0) &&
+        !meta._content);
+}
+/**
+ * Handle an empty-scope meta: set all phases fresh, bump _generatedAt.
+ * Prevents perpetual staleness without wasting tokens on synthesis.
+ */
+async function handleEmptyScope(node, currentMeta, config, structureHash, logger) {
+    await persistPhaseState({
+        metaPath: node.metaPath,
+        current: currentMeta,
+        structureHash,
+    }, freshPhaseState(), { _generatedAt: new Date().toISOString() });
+    logger?.info({ path: node.ownerPath }, 'Empty scope — set all phases fresh, bumped _generatedAt');
+}
 /** Phase runner dispatch map — avoids repeating the same switch/case. */
 const phaseRunners = {
     architect: runArchitect,
@@ -2853,6 +2962,11 @@ async function orchestratePhase(config, executor, watcher, targetPath, onProgres
         // Compute structure hash for the phase
         const { scopeFiles } = await getScopeFiles(winner.node, watcher);
         const structureHash = computeStructureHash(scopeFiles);
+        // Empty-scope guard (§3.9, #177): skip synthesis when nothing to synthesize
+        if (isEmptyScope(scopeFiles, winner.node, currentMeta)) {
+            await handleEmptyScope(winner.node, currentMeta, config, structureHash, logger);
+            return { executed: false };
+        }
         // skipUnchanged: bump _generatedAt without altering _phaseState
         if (config.skipUnchanged && currentMeta._generatedAt) {
             const verifiedStale = await isStale(getScopePrefix(winner.node), currentMeta, watcher);
@@ -2894,6 +3008,11 @@ async function orchestrateTargeted(config, executor, watcher, targetPath, onProg
         // Compute structure hash
         const { scopeFiles } = await getScopeFiles(node, watcher);
         const structureHash = computeStructureHash(scopeFiles);
+        // Empty-scope guard (§3.9, #177): skip synthesis when nothing to synthesize
+        if (isEmptyScope(scopeFiles, node, currentMeta)) {
+            await handleEmptyScope(node, currentMeta, config, structureHash, logger);
+            return { executed: false, metaPath: normalizedTarget };
+        }
         return await executePhase(node, currentMeta, phaseState, owedPhase, config, executor, watcher, structureHash, onProgress, logger);
     }
     finally {
@@ -3625,12 +3744,6 @@ async function createMeta(ownerPath, options) {
         metaJson._crossRefs = options.crossRefs;
     if (options?.steer !== undefined)
         metaJson._steer = options.steer;
-    if (options?.architectTimeout !== undefined)
-        metaJson._architectTimeout = options.architectTimeout;
-    if (options?.builderTimeout !== undefined)
-        metaJson._builderTimeout = options.builderTimeout;
-    if (options?.criticTimeout !== undefined)
-        metaJson._criticTimeout = options.criticTimeout;
     const metaJsonPath = join(metaDir, 'meta.json');
     await writeFile(metaJsonPath, JSON.stringify(metaJson, null, 2) + '\n');
     return { metaDir, _id };
@@ -3706,9 +3819,6 @@ async function autoSeedPass(rules, watcher, logger) {
             candidates.set(dir, {
                 steer: rule.steer,
                 crossRefs: rule.crossRefs,
-                architectTimeout: rule.architectTimeout,
-                builderTimeout: rule.builderTimeout,
-                criticTimeout: rule.criticTimeout,
             });
         }
     }
@@ -4056,6 +4166,12 @@ function registerConfigApplyRoute(app, configPath) {
                 .status(500)
                 .send({ error: `Failed to write config: ${message}` });
         }
+        // Compute whether any restart-required fields actually changed
+        // (compares validated output against previous config, catching both
+        // explicit patch keys and implicit changes via replace + schema defaults)
+        const validatedRecord = validatedConfig;
+        const restartRequired = RESTART_REQUIRED_FIELDS.some((field) => JSON.stringify(existing[field]) !==
+            JSON.stringify(validatedRecord[field]));
         // Apply hot-reload callback
         try {
             applyHotReloadedConfig(validatedConfig);
@@ -4065,11 +4181,12 @@ function registerConfigApplyRoute(app, configPath) {
             return reply.status(200).send({
                 applied: true,
                 warning: `Config written but callback failed: ${message}`,
-                restartRequired: RESTART_REQUIRED_FIELDS,
+                restartRequired,
             });
         }
         return reply.status(200).send({
             applied: true,
+            restartRequired,
         });
     });
 }
@@ -4271,7 +4388,7 @@ function registerMetasRoutes(app, deps) {
 /**
  * PATCH /metas/:path — update user-settable reserved properties on a meta.
  *
- * Supported fields: _steer, _emphasis, _depth, _crossRefs, _disabled, _architectTimeout, _builderTimeout, _criticTimeout.
+ * Supported fields: _steer, _emphasis, _depth, _crossRefs, _disabled.
  * Set a field to null to remove it. Unknown keys are rejected.
  *
  * @module routes/metasUpdate
@@ -4283,9 +4400,6 @@ const updateBodySchema = z
     _depth: z.union([z.number(), z.null()]).optional(),
     _crossRefs: z.union([z.array(z.string()), z.null()]).optional(),
     _disabled: z.union([z.boolean(), z.null()]).optional(),
-    _architectTimeout: z.union([z.number().int().min(30), z.null()]).optional(),
-    _builderTimeout: z.union([z.number().int().min(30), z.null()]).optional(),
-    _criticTimeout: z.union([z.number().int().min(30), z.null()]).optional(),
 })
     .strict();
 function registerMetasUpdateRoute(app, deps) {
@@ -4330,6 +4444,7 @@ function registerMetasUpdateRoute(app, deps) {
         }
         Object.assign(updated, toSet);
         await writeFile(metaJsonPath, JSON.stringify(updated, null, 2) + '\n');
+        deps.cache.invalidate();
         // Project the response — exclude the same large fields as the detail route.
         const projected = {};
         for (const [k, v] of Object.entries(updated)) {
@@ -4367,10 +4482,10 @@ function registerPreviewRoute(app, deps) {
             const normalized = normalizePath(query.path);
             targetNode = findNode(result.tree, normalized);
             if (!targetNode) {
-                return {
+                return reply.status(404).send({
                     error: 'NOT_FOUND',
                     message: 'Meta path not found: ' + query.path,
-                };
+                });
             }
         }
         else {
@@ -4940,7 +5055,7 @@ function registerRoutes(app, deps) {
     });
     registerStatusRoute(app, deps);
     registerMetasRoutes(app, deps);
-    registerMetasUpdateRoute(app);
+    registerMetasUpdateRoute(app, deps);
     registerSynthesizeRoute(app, deps);
     registerPreviewRoute(app, deps);
     registerSeedRoute(app, deps);
@@ -5027,6 +5142,18 @@ function registerShutdownHandlers(deps) {
                 deps.logger.warn({ path: current.path }, 'Failed to release lock during shutdown');
             }
         }
+        // Release lock for in-progress override synthesis (only when it
+        // differs from the legacy current item to avoid double-release)
+        const currentPhase = deps.queue.currentPhase;
+        if (currentPhase && currentPhase.path !== current?.path) {
+            try {
+                releaseLock(resolveMetaDir(currentPhase.path));
+                deps.logger.info({ path: currentPhase.path }, 'Released lock for in-progress override synthesis');
+            }
+            catch {
+                deps.logger.warn({ path: currentPhase.path }, 'Failed to release override lock during shutdown');
+            }
+        }
         // 3. Close server
         try {
             await deps.server.close();
@@ -5124,6 +5251,25 @@ class HttpWatcherClient {
  *
  * @module bootstrap
  */
+/**
+ * Compute per-cycle token total from a completed meta.
+ *
+ * Exported for testing.
+ *
+ * Uses `_synthesisCount` as a discriminator: after increment by `runCritic`,
+ * a value of 1 means architect ran this cycle (was 0 pre-increment),
+ * so all three phase token fields are summed. A value \> 1 means architect
+ * was skipped (cached brief reused), so only builder + critic are summed.
+ */
+function computeCycleTokens(meta) {
+    const builderTokens = meta._builderTokens ?? 0;
+    const criticTokens = meta._criticTokens ?? 0;
+    const architectRan = (meta._synthesisCount ?? 1) === 1;
+    const architectTokens = architectRan
+        ? (meta._architectTokens ?? 0)
+        : 0;
+    return architectTokens + builderTokens + criticTokens;
+}
 /**
  * Bootstrap the service: create logger, build server, start listening,
  * wire scheduler, queue processing, rule registration, config hot-reload,
@@ -5250,10 +5396,15 @@ async function startService(config, configPath) {
             }
             // Emit synthesis_complete only on full-cycle completion
             if (result.cycleComplete) {
+                const updatedMeta = result.phaseResult?.updatedMeta;
+                const tokens = updatedMeta
+                    ? computeCycleTokens(updatedMeta)
+                    : undefined;
                 await progress.report({
                     type: 'synthesis_complete',
                     path: ownerPath,
                     durationMs,
+                    tokens,
                 });
             }
         }

package/dist/executor/GatewayExecutor.d.ts

@@ -36,13 +36,32 @@ export declare class GatewayExecutor implements MetaExecutor {
     constructor(options?: GatewayExecutorOptions);
     /** Remove a temp output file if it exists. */
     private cleanupOutputFile;
+    /** Read and clean up the staging output file. Returns content or undefined if absent. */
+    private readStagingFile;
+    /** Extract plain text from a message content field, skipping ANNOUNCE_SKIP sentinels. */
+    private static extractMessageText;
+    /** Check history messages for terminal completion. */
+    private static checkHistoryCompletion;
     /** Invoke a gateway tool via the /tools/invoke HTTP endpoint. */
     private invoke;
-    /** Look up session metadata (tokens, completion status) via sessions_list. */
+    /**
+     * Look up session metadata (tokens, completion status) via sessions_list.
+     *
+     * Detects gateway-side timeout (`status: "timeout"`) and killed sessions
+     * (`status: "killed"`) as completed, with a `timedOut` flag to distinguish
+     * timeout from normal completion.
+     */
     private getSessionInfo;
     /** Whether this executor has been aborted by the operator. */
     get aborted(): boolean;
     /** Abort the currently running spawn, if any. */
     abort(): void;
+    /**
+     * Query the gateway's configured subagent run timeout.
+     *
+     * Returns the value in milliseconds, or `undefined` if the query fails
+     * or the value is absent/zero (no timeout configured).
+     */
+    private queryGatewayRunTimeout;
     spawn(task: string, options?: MetaSpawnOptions): Promise<MetaSpawnResult>;
 }

package/dist/index.js

@@ -1271,12 +1271,6 @@ const autoSeedRuleSchema = z.object({
     crossRefs: z.array(z.string()).optional(),
     /** Walk up this many extra parent levels from the matched file's directory. Default 0. */
     parentDepth: z.number().int().min(0).optional(),
-    /** Per-category timeout override for the architect phase (seconds, min 30). */
-    architectTimeout: z.number().int().min(30).optional(),
-    /** Per-category timeout override for the builder phase (seconds, min 30). */
-    builderTimeout: z.number().int().min(30).optional(),
-    /** Per-category timeout override for the critic phase (seconds, min 30). */
-    criticTimeout: z.number().int().min(30).optional(),
 });
 /** Zod schema for jeeves-meta service configuration (superset of MetaConfig). */
 const serviceConfigSchema = metaConfigSchema.extend({
@@ -1459,7 +1453,7 @@ class SpawnTimeoutError extends Error {
  * @module executor/GatewayExecutor
  */
 const DEFAULT_POLL_INTERVAL_MS = 5000;
-const DEFAULT_TIMEOUT_MS$1 = 600_000; // 10 minutes
+const DEFAULT_SAFETY_VALVE_MS = 3_600_000; // 1 hour fallback
 /**
  * MetaExecutor that spawns OpenClaw sessions via the gateway's
  * `/tools/invoke` endpoint.
@@ -1490,6 +1484,42 @@ class GatewayExecutor {
             /* best-effort cleanup */
         }
     }
+    /** Read and clean up the staging output file. Returns content or undefined if absent. */
+    readStagingFile(outputPath) {
+        if (!existsSync(outputPath))
+            return undefined;
+        try {
+            return readFileSync(outputPath, 'utf8');
+        }
+        finally {
+            this.cleanupOutputFile(outputPath);
+        }
+    }
+    /** Extract plain text from a message content field, skipping ANNOUNCE_SKIP sentinels. */
+    static extractMessageText(content) {
+        if (!content)
+            return undefined;
+        const text = typeof content === 'string'
+            ? content
+            : Array.isArray(content)
+                ? content
+                    .filter((b) => b.type === 'text' && b.text)
+                    .map((b) => b.text)
+                    .join('\n')
+                : '';
+        return text && text.trim() !== 'ANNOUNCE_SKIP' ? text : undefined;
+    }
+    /** Check history messages for terminal completion. */
+    static checkHistoryCompletion(messages) {
+        if (messages.length === 0)
+            return { done: false, timedOut: false };
+        const last = messages[messages.length - 1];
+        if (last.role !== 'assistant' || !last.stopReason)
+            return { done: false, timedOut: false };
+        if (last.stopReason === 'toolUse' || last.stopReason === 'error')
+            return { done: false, timedOut: false };
+        return { done: true, timedOut: last.stopReason === 'timeout' };
+    }
     /** Invoke a gateway tool via the /tools/invoke HTTP endpoint. */
     async invoke(tool, args, sessionKey) {
         const headers = {
@@ -1516,7 +1546,13 @@ class GatewayExecutor {
         }
         return data;
     }
-    /** Look up session metadata (tokens, completion status) via sessions_list. */
+    /**
+     * Look up session metadata (tokens, completion status) via sessions_list.
+     *
+     * Detects gateway-side timeout (`status: "timeout"`) and killed sessions
+     * (`status: "killed"`) as completed, with a `timedOut` flag to distinguish
+     * timeout from normal completion.
+     */
     async getSessionInfo(sessionKey) {
         try {
             const result = await this.invoke('sessions_list', {
@@ -1532,13 +1568,18 @@ class GatewayExecutor {
                 // With limit=200 this is reliable; a false positive here only
                 // means we read the output file slightly early (still correct
                 // if the file exists).
-                return { completed: true };
+                return { completed: true, timedOut: false };
             }
-            const done = match.status === 'completed' || match.status === 'done';
-            return { tokens: match.totalTokens, completed: done };
+            const status = match.status;
+            const done = status === 'completed' ||
+                status === 'done' ||
+                status === 'timeout' ||
+                status === 'killed';
+            const timedOut = status === 'timeout';
+            return { tokens: match.totalTokens, completed: done, timedOut };
         }
         catch {
-            return { completed: false };
+            return { completed: false, timedOut: false };
         }
     }
     /** Whether this executor has been aborted by the operator. */
@@ -1549,12 +1590,38 @@ class GatewayExecutor {
     abort() {
         this.controller.abort();
     }
+    /**
+     * Query the gateway's configured subagent run timeout.
+     *
+     * Returns the value in milliseconds, or `undefined` if the query fails
+     * or the value is absent/zero (no timeout configured).
+     */
+    async queryGatewayRunTimeout() {
+        try {
+            const result = await this.invoke('session_status', {});
+            const details = (result.result?.details ?? result.result ?? {});
+            const runTimeoutSeconds = details.runTimeoutSeconds ??
+                details.timeout;
+            if (typeof runTimeoutSeconds === 'number' && runTimeoutSeconds > 0) {
+                return runTimeoutSeconds * 1000;
+            }
+        }
+        catch {
+            // Gateway unreachable or field not exposed — fall back to default
+        }
+        return undefined;
+    }
     async spawn(task, options) {
         // Fresh controller for each spawn call
         this.controller = new AbortController();
-        const timeoutSeconds = options?.timeout ?? DEFAULT_TIMEOUT_MS$1 / 1000;
-        const timeoutMs = timeoutSeconds * 1000;
-        const deadline = Date.now() + timeoutMs;
+        // Safety-valve deadline: gateway's runTimeoutSeconds + 60s buffer,
+        // defaulting to 1 hour if the gateway value is 0/absent/query fails.
+        // This is a circuit breaker, not a timeout mechanism.
+        const gatewayTimeoutMs = await this.queryGatewayRunTimeout();
+        const safetyValveMs = gatewayTimeoutMs
+            ? gatewayTimeoutMs + 60_000
+            : DEFAULT_SAFETY_VALVE_MS;
+        const safetyDeadline = Date.now() + safetyValveMs;
         // Ensure workspace dir exists
         if (!existsSync(this.workspaceDir)) {
             mkdirSync(this.workspaceDir, { recursive: true });
@@ -1576,7 +1643,6 @@ class GatewayExecutor {
         const spawnResult = await this.invoke('sessions_spawn', {
             task: taskWithOutput,
             label,
-            runTimeoutSeconds: timeoutSeconds,
             ...(options?.thinking ? { thinking: options.thinking } : {}),
             ...(options?.model ? { model: options.model } : {}),
         });
@@ -1588,9 +1654,18 @@ class GatewayExecutor {
             throw new Error('Gateway sessions_spawn returned no sessionKey: ' +
                 JSON.stringify(spawnResult));
         }
-        // Step 2: Poll for completion via sessions_history
+        // Step 2: Poll for completion — gateway owns the subagent lifecycle.
+        // Loop exits via: (a) completion detection, (b) abort signal,
+        // (c) gateway-side timeout detection, or (d) safety-valve circuit breaker.
         await sleepAsync(3000);
-        while (Date.now() < deadline) {
+        while (true) {
+            // Safety-valve circuit breaker
+            if (Date.now() >= safetyDeadline) {
+                this.cleanupOutputFile(outputPath);
+                throw new SpawnTimeoutError('Safety-valve deadline exceeded (' +
+                    safetyValveMs.toString() +
+                    'ms) — gateway timeout may be misconfigured', outputPath);
+            }
             // Check for abort before each poll iteration
             if (this.controller.signal.aborted) {
                 this.cleanupOutputFile(outputPath);
@@ -1607,62 +1682,48 @@ class GatewayExecutor {
                     [];
                 const msgArray = messages;
                 // Check 1: terminal stop reason in history
-                let historyDone = false;
-                if (msgArray.length > 0) {
-                    const lastMsg = msgArray[msgArray.length - 1];
-                    if (lastMsg.role === 'assistant' &&
-                        lastMsg.stopReason &&
-                        lastMsg.stopReason !== 'toolUse' &&
-                        lastMsg.stopReason !== 'error') {
-                        historyDone = true;
-                    }
-                }
+                const { done: historyDone, timedOut: historyTimedOut } = GatewayExecutor.checkHistoryCompletion(msgArray);
                 // Check 2: session completion status via sessions_list
                 const sessionInfo = await this.getSessionInfo(sessionKey);
+                const timedOut = sessionInfo.timedOut || historyTimedOut;
                 if (historyDone || sessionInfo.completed) {
                     const tokens = sessionInfo.tokens;
-                    // Read output from file (sub-agent wrote it via Write tool)
-                    if (existsSync(outputPath)) {
-                        try {
-                            const output = readFileSync(outputPath, 'utf8');
+                    // Gateway-side timeout detected — check staging file for recovery
+                    if (timedOut) {
+                        const output = this.readStagingFile(outputPath);
+                        if (output !== undefined)
                             return { output, tokens };
-                        }
-                        finally {
-                            try {
-                                unlinkSync(outputPath);
-                            }
-                            catch {
-                                /* cleanup best-effort */
-                            }
-                        }
+                        // No output or partial output — throw for _state recovery (§3.16.6)
+                        throw new SpawnTimeoutError('Gateway-side timeout detected (session status: timeout)', outputPath);
                     }
+                    // Normal completion — read output from file
+                    const output = this.readStagingFile(outputPath);
+                    if (output !== undefined)
+                        return { output, tokens };
                     // Fallback: extract from message content if file wasn't written.
                     // Skip ANNOUNCE_SKIP sentinel messages — the real output is in
                     // a preceding assistant message (the file write).
                     for (let i = msgArray.length - 1; i >= 0; i--) {
                         const msg = msgArray[i];
-                        if (msg.role === 'assistant' && msg.content) {
-                            const text = typeof msg.content === 'string'
-                                ? msg.content
-                                : Array.isArray(msg.content)
-                                    ? msg.content
-                                        .filter((b) => b.type === 'text' && b.text)
-                                        .map((b) => b.text)
-                                        .join('\n')
-                                    : '';
-                            if (text && text.trim() !== 'ANNOUNCE_SKIP')
+                        if (msg.role === 'assistant') {
+                            const text = GatewayExecutor.extractMessageText(msg.content);
+                            if (text !== undefined)
                                 return { output: text, tokens };
                         }
                     }
                     return { output: '', tokens };
                 }
             }
-            catch {
+            catch (err) {
+                // Re-throw SpawnTimeoutError and SpawnAbortedError — only swallow transient poll failures
+                if (err instanceof SpawnTimeoutError ||
+                    err instanceof SpawnAbortedError) {
+                    throw err;
+                }
                 // Transient poll failure — keep trying
             }
             await sleepAsync(this.pollIntervalMs);
         }
-        throw new SpawnTimeoutError('Synthesis subprocess timed out after ' + timeoutMs.toString() + 'ms', outputPath);
     }
 }
 
@@ -2595,7 +2656,7 @@ function buildPhaseCandidates(entries, architectEvery) {
         if (entry.meta._phaseState) {
             const needsArchitect = !entry.meta._builder ||
                 (entry.meta._synthesisCount ?? 0) >= architectEvery;
-            if (needsArchitect && ps.architect === 'fresh') {
+            if (needsArchitect && isFullyFresh(ps)) {
                 ps = { architect: 'pending', builder: 'stale', critic: 'stale' };
             }
         }
@@ -2831,6 +2892,9 @@ async function persistPhaseState(base, phaseState, updates) {
         _phaseState: phaseState,
         _structureHash: base.structureHash,
     };
+    if (!merged._id) {
+        merged._id = randomUUID();
+    }
     // Clean undefined
     if (merged._error === undefined)
         delete merged._error;
@@ -2881,7 +2945,6 @@ async function runArchitect(node, currentMeta, phaseState, config, executor, wat
         const architectTask = buildArchitectTask(ctx, currentMeta, config);
         const result = await executor.spawn(architectTask, {
             thinking: config.thinking,
-            timeout: currentMeta._architectTimeout ?? config.architectTimeout,
             label: 'meta-architect',
         });
         const builderBrief = parseArchitectOutput(result.output);
@@ -2933,10 +2996,35 @@ async function runBuilder(node, currentMeta, phaseState, config, executor, watch
         const builderTask = buildBuilderTask(ctx, currentMeta, config);
         const result = await executor.spawn(builderTask, {
             thinking: config.thinking,
-            timeout: currentMeta._builderTimeout ?? config.builderTimeout,
             label: 'meta-builder',
         });
-        const builderOutput = parseBuilderOutput(result.output);
+        const rawOutput = result.output;
+        // Exact match only — ANNOUNCE_SKIP as the entire output means "no update."
+        // A trailing sentinel on valid output (e.g. JSON + ANNOUNCE_SKIP) is handled
+        // by stripSentinel() inside parseBuilderOutput and is NOT a skip.
+        const isSkip = rawOutput.trim() === 'ANNOUNCE_SKIP';
+        if (isSkip) {
+            // ANNOUNCE_SKIP: preserve existing _content, bump _generatedAt only
+            ps = builderSuccess(ps);
+            const skipUpdates = {
+                _builderTokens: result.tokens,
+                _generatedAt: new Date().toISOString(),
+                _error: undefined,
+            };
+            const ancestorHash = hashAncestorBuilder(ctx.ancestorBuilder);
+            if (ancestorHash)
+                skipUpdates._ancestorBuilderHash = ancestorHash;
+            const updatedMeta = await persistPhaseState(base, ps, skipUpdates);
+            await onProgress?.({
+                type: 'phase_complete',
+                path: node.ownerPath,
+                phase: 'builder',
+                tokens: result.tokens,
+                durationMs: Date.now() - builderStart,
+            });
+            return { executed: true, phaseState: ps, updatedMeta };
+        }
+        const builderOutput = parseBuilderOutput(rawOutput);
         const builderTokens = result.tokens;
         // Builder success: builder → fresh, critic → pending
         ps = builderSuccess(ps);
@@ -3002,7 +3090,6 @@ async function runCritic(node, currentMeta, phaseState, config, executor, watche
         const criticTask = buildCriticTask(ctx, metaForCritic, config);
         const result = await executor.spawn(criticTask, {
             thinking: config.thinking,
-            timeout: currentMeta._criticTimeout ?? config.criticTimeout,
             label: 'meta-critic',
         });
         const feedback = parseCriticOutput(result.output);
@@ -3056,6 +3143,28 @@ async function runCritic(node, currentMeta, phaseState, config, executor, watche
  *
  * @module orchestrator/orchestratePhase
  */
+/**
+ * Check whether a meta has an empty scope — no source files, no children,
+ * no cross-refs, and no prior content. Matches §3.9 empty-scope criteria.
+ */
+function isEmptyScope(scopeFiles, node, meta) {
+    return (scopeFiles.length === 0 &&
+        node.children.length === 0 &&
+        (!meta._crossRefs || meta._crossRefs.length === 0) &&
+        !meta._content);
+}
+/**
+ * Handle an empty-scope meta: set all phases fresh, bump _generatedAt.
+ * Prevents perpetual staleness without wasting tokens on synthesis.
+ */
+async function handleEmptyScope(node, currentMeta, config, structureHash, logger) {
+    await persistPhaseState({
+        metaPath: node.metaPath,
+        current: currentMeta,
+        structureHash,
+    }, freshPhaseState(), { _generatedAt: new Date().toISOString() });
+    logger?.info({ path: node.ownerPath }, 'Empty scope — set all phases fresh, bumped _generatedAt');
+}
 /** Phase runner dispatch map — avoids repeating the same switch/case. */
 const phaseRunners = {
     architect: runArchitect,
@@ -3111,6 +3220,11 @@ async function orchestratePhase(config, executor, watcher, targetPath, onProgres
         // Compute structure hash for the phase
         const { scopeFiles } = await getScopeFiles(winner.node, watcher);
         const structureHash = computeStructureHash(scopeFiles);
+        // Empty-scope guard (§3.9, #177): skip synthesis when nothing to synthesize
+        if (isEmptyScope(scopeFiles, winner.node, currentMeta)) {
+            await handleEmptyScope(winner.node, currentMeta, config, structureHash, logger);
+            return { executed: false };
+        }
         // skipUnchanged: bump _generatedAt without altering _phaseState
         if (config.skipUnchanged && currentMeta._generatedAt) {
             const verifiedStale = await isStale(getScopePrefix(winner.node), currentMeta, watcher);
@@ -3152,6 +3266,11 @@ async function orchestrateTargeted(config, executor, watcher, targetPath, onProg
         // Compute structure hash
         const { scopeFiles } = await getScopeFiles(node, watcher);
         const structureHash = computeStructureHash(scopeFiles);
+        // Empty-scope guard (§3.9, #177): skip synthesis when nothing to synthesize
+        if (isEmptyScope(scopeFiles, node, currentMeta)) {
+            await handleEmptyScope(node, currentMeta, config, structureHash, logger);
+            return { executed: false, metaPath: normalizedTarget };
+        }
         return await executePhase(node, currentMeta, phaseState, owedPhase, config, executor, watcher, structureHash, onProgress, logger);
     }
     finally {
@@ -3883,12 +4002,6 @@ async function createMeta(ownerPath, options) {
         metaJson._crossRefs = options.crossRefs;
     if (options?.steer !== undefined)
         metaJson._steer = options.steer;
-    if (options?.architectTimeout !== undefined)
-        metaJson._architectTimeout = options.architectTimeout;
-    if (options?.builderTimeout !== undefined)
-        metaJson._builderTimeout = options.builderTimeout;
-    if (options?.criticTimeout !== undefined)
-        metaJson._criticTimeout = options.criticTimeout;
     const metaJsonPath = join(metaDir, 'meta.json');
     await writeFile(metaJsonPath, JSON.stringify(metaJson, null, 2) + '\n');
     return { metaDir, _id };
@@ -3964,9 +4077,6 @@ async function autoSeedPass(rules, watcher, logger) {
             candidates.set(dir, {
                 steer: rule.steer,
                 crossRefs: rule.crossRefs,
-                architectTimeout: rule.architectTimeout,
-                builderTimeout: rule.builderTimeout,
-                criticTimeout: rule.criticTimeout,
             });
         }
     }
@@ -4314,6 +4424,12 @@ function registerConfigApplyRoute(app, configPath) {
                 .status(500)
                 .send({ error: `Failed to write config: ${message}` });
         }
+        // Compute whether any restart-required fields actually changed
+        // (compares validated output against previous config, catching both
+        // explicit patch keys and implicit changes via replace + schema defaults)
+        const validatedRecord = validatedConfig;
+        const restartRequired = RESTART_REQUIRED_FIELDS.some((field) => JSON.stringify(existing[field]) !==
+            JSON.stringify(validatedRecord[field]));
         // Apply hot-reload callback
         try {
             applyHotReloadedConfig(validatedConfig);
@@ -4323,11 +4439,12 @@ function registerConfigApplyRoute(app, configPath) {
             return reply.status(200).send({
                 applied: true,
                 warning: `Config written but callback failed: ${message}`,
-                restartRequired: RESTART_REQUIRED_FIELDS,
+                restartRequired,
             });
         }
         return reply.status(200).send({
             applied: true,
+            restartRequired,
         });
     });
 }
@@ -4529,7 +4646,7 @@ function registerMetasRoutes(app, deps) {
 /**
  * PATCH /metas/:path — update user-settable reserved properties on a meta.
  *
- * Supported fields: _steer, _emphasis, _depth, _crossRefs, _disabled, _architectTimeout, _builderTimeout, _criticTimeout.
+ * Supported fields: _steer, _emphasis, _depth, _crossRefs, _disabled.
  * Set a field to null to remove it. Unknown keys are rejected.
  *
  * @module routes/metasUpdate
@@ -4541,9 +4658,6 @@ const updateBodySchema = z
     _depth: z.union([z.number(), z.null()]).optional(),
     _crossRefs: z.union([z.array(z.string()), z.null()]).optional(),
     _disabled: z.union([z.boolean(), z.null()]).optional(),
-    _architectTimeout: z.union([z.number().int().min(30), z.null()]).optional(),
-    _builderTimeout: z.union([z.number().int().min(30), z.null()]).optional(),
-    _criticTimeout: z.union([z.number().int().min(30), z.null()]).optional(),
 })
     .strict();
 function registerMetasUpdateRoute(app, deps) {
@@ -4588,6 +4702,7 @@ function registerMetasUpdateRoute(app, deps) {
         }
         Object.assign(updated, toSet);
         await writeFile(metaJsonPath, JSON.stringify(updated, null, 2) + '\n');
+        deps.cache.invalidate();
         // Project the response — exclude the same large fields as the detail route.
         const projected = {};
         for (const [k, v] of Object.entries(updated)) {
@@ -4625,10 +4740,10 @@ function registerPreviewRoute(app, deps) {
             const normalized = normalizePath(query.path);
             targetNode = findNode(result.tree, normalized);
             if (!targetNode) {
-                return {
+                return reply.status(404).send({
                     error: 'NOT_FOUND',
                     message: 'Meta path not found: ' + query.path,
-                };
+                });
             }
         }
         else {
@@ -5170,7 +5285,7 @@ function registerRoutes(app, deps) {
     });
     registerStatusRoute(app, deps);
     registerMetasRoutes(app, deps);
-    registerMetasUpdateRoute(app);
+    registerMetasUpdateRoute(app, deps);
     registerSynthesizeRoute(app, deps);
     registerPreviewRoute(app, deps);
     registerSeedRoute(app, deps);
@@ -5257,6 +5372,18 @@ function registerShutdownHandlers(deps) {
                 deps.logger.warn({ path: current.path }, 'Failed to release lock during shutdown');
             }
         }
+        // Release lock for in-progress override synthesis (only when it
+        // differs from the legacy current item to avoid double-release)
+        const currentPhase = deps.queue.currentPhase;
+        if (currentPhase && currentPhase.path !== current?.path) {
+            try {
+                releaseLock(resolveMetaDir(currentPhase.path));
+                deps.logger.info({ path: currentPhase.path }, 'Released lock for in-progress override synthesis');
+            }
+            catch {
+                deps.logger.warn({ path: currentPhase.path }, 'Failed to release override lock during shutdown');
+            }
+        }
         // 3. Close server
         try {
             await deps.server.close();
@@ -5354,6 +5481,25 @@ class HttpWatcherClient {
  *
  * @module bootstrap
  */
+/**
+ * Compute per-cycle token total from a completed meta.
+ *
+ * Exported for testing.
+ *
+ * Uses `_synthesisCount` as a discriminator: after increment by `runCritic`,
+ * a value of 1 means architect ran this cycle (was 0 pre-increment),
+ * so all three phase token fields are summed. A value \> 1 means architect
+ * was skipped (cached brief reused), so only builder + critic are summed.
+ */
+function computeCycleTokens(meta) {
+    const builderTokens = meta._builderTokens ?? 0;
+    const criticTokens = meta._criticTokens ?? 0;
+    const architectRan = (meta._synthesisCount ?? 1) === 1;
+    const architectTokens = architectRan
+        ? (meta._architectTokens ?? 0)
+        : 0;
+    return architectTokens + builderTokens + criticTokens;
+}
 /**
  * Bootstrap the service: create logger, build server, start listening,
  * wire scheduler, queue processing, rule registration, config hot-reload,
@@ -5480,10 +5626,15 @@ async function startService(config, configPath) {
             }
             // Emit synthesis_complete only on full-cycle completion
             if (result.cycleComplete) {
+                const updatedMeta = result.phaseResult?.updatedMeta;
+                const tokens = updatedMeta
+                    ? computeCycleTokens(updatedMeta)
+                    : undefined;
                 await progress.report({
                     type: 'synthesis_complete',
                     path: ownerPath,
                     durationMs,
+                    tokens,
                 });
             }
         }
@@ -5712,12 +5863,6 @@ const metaJsonSchema = z
     _error: metaErrorSchema.optional(),
     /** When true, this meta is skipped during staleness scheduling. Manual trigger still works. */
     _disabled: z.boolean().optional(),
-    /** Per-entity timeout override for the architect phase (seconds, min 30). */
-    _architectTimeout: z.number().int().min(30).optional(),
-    /** Per-entity timeout override for the builder phase (seconds, min 30). */
-    _builderTimeout: z.number().int().min(30).optional(),
-    /** Per-entity timeout override for the critic phase (seconds, min 30). */
-    _criticTimeout: z.number().int().min(30).optional(),
     /**
      * SHA-256 hash of ancestor _builder text at last synthesis.
      * Observability only — no invalidation cascade.

package/dist/interfaces/MetaExecutor.d.ts

@@ -7,8 +7,6 @@
 export interface MetaSpawnOptions {
     /** Model override for this subprocess. */
     model?: string;
-    /** Timeout in seconds. */
-    timeout?: number;
     /** Label for the spawned session. */
     label?: string;
     /** Thinking level (e.g. "low", "medium", "high"). */

package/dist/orchestrator/orchestratePhase.d.ts

@@ -8,11 +8,17 @@
  *
  * @module orchestrator/orchestratePhase
  */
+import type { MetaNode } from '../discovery/types.js';
 import type { MetaExecutor, WatcherClient } from '../interfaces/index.js';
 import type { MinimalLogger } from '../logger/index.js';
 import type { ProgressEvent } from '../progress/index.js';
-import type { MetaConfig, PhaseName } from '../schema/index.js';
+import type { MetaConfig, MetaJson, PhaseName } from '../schema/index.js';
 import { type PhaseResult } from './runPhase.js';
+/**
+ * Check whether a meta has an empty scope — no source files, no children,
+ * no cross-refs, and no prior content. Matches §3.9 empty-scope criteria.
+ */
+export declare function isEmptyScope(scopeFiles: string[], node: MetaNode, meta: MetaJson): boolean;
 /** Callback for synthesis progress events. */
 export type PhaseProgressCallback = (event: ProgressEvent) => void | Promise<void>;
 /** Result of a single phase-aware orchestration tick. */

package/dist/prompts/architect.md

@@ -128,8 +128,6 @@ The Builder should:
 4. Merge new findings with previous `_content` (carried in context)
 
 If the scope is small enough to process in one pass, omit chunking instructions.
-The Builder has a timeout of \{{config.builderTimeout}} seconds.
-
 ### 8. Output Structure
 
 Define non-underscore fields for structured data and the _content narrative
@@ -148,7 +146,6 @@ Quote the specific issue and state what to do differently.
 Your task brief will be compiled as a Handlebars template before the Builder
 receives it. You can use these variables to write adaptive instructions:
 
-- `\{{config.builderTimeout}}` — Builder timeout in seconds
 - `\{{config.maxLines}}` — Maximum _content lines
 - `\{{config.architectEvery}}` — Cycles between architect refreshes
 - `\{{config.maxArchive}}` — Archive snapshots retained
@@ -159,7 +156,7 @@ receives it. You can use these variables to write adaptive instructions:
 - `\{{meta._depth}}` — Scheduling depth
 - `\{{meta._emphasis}}` — Scheduling emphasis
 
-Example: "Process files in chunks of 50. You have \{{config.builderTimeout}} seconds."
+Example: "Process files in chunks of 50. Limit output to \{{config.maxLines}} lines."
 
 ## Constraints
 

package/dist/routes/metasUpdate.d.ts

@@ -1,7 +1,7 @@
 /**
  * PATCH /metas/:path — update user-settable reserved properties on a meta.
  *
- * Supported fields: _steer, _emphasis, _depth, _crossRefs, _disabled, _architectTimeout, _builderTimeout, _criticTimeout.
+ * Supported fields: _steer, _emphasis, _depth, _crossRefs, _disabled.
  * Set a field to null to remove it. Unknown keys are rejected.
  *
  * @module routes/metasUpdate

package/dist/schema/config.d.ts

@@ -14,9 +14,6 @@ declare const autoSeedRuleSchema: z.ZodObject<{
     steer: z.ZodOptional<z.ZodString>;
     crossRefs: z.ZodOptional<z.ZodArray<z.ZodString>>;
     parentDepth: z.ZodOptional<z.ZodNumber>;
-    architectTimeout: z.ZodOptional<z.ZodNumber>;
-    builderTimeout: z.ZodOptional<z.ZodNumber>;
-    criticTimeout: z.ZodOptional<z.ZodNumber>;
 }, z.core.$strip>;
 /** Inferred type for an auto-seed rule. */
 export type AutoSeedRule = z.infer<typeof autoSeedRuleSchema>;
@@ -29,9 +26,6 @@ export declare const serviceConfigSchema: z.ZodObject<{
     depthWeight: z.ZodDefault<z.ZodNumber>;
     maxArchive: z.ZodDefault<z.ZodNumber>;
     maxLines: z.ZodDefault<z.ZodNumber>;
-    architectTimeout: z.ZodDefault<z.ZodNumber>;
-    builderTimeout: z.ZodDefault<z.ZodNumber>;
-    criticTimeout: z.ZodDefault<z.ZodNumber>;
     thinking: z.ZodDefault<z.ZodString>;
     defaultArchitect: z.ZodOptional<z.ZodString>;
     defaultCritic: z.ZodOptional<z.ZodString>;
@@ -54,9 +48,6 @@ export declare const serviceConfigSchema: z.ZodObject<{
         steer: z.ZodOptional<z.ZodString>;
         crossRefs: z.ZodOptional<z.ZodArray<z.ZodString>>;
         parentDepth: z.ZodOptional<z.ZodNumber>;
-        architectTimeout: z.ZodOptional<z.ZodNumber>;
-        builderTimeout: z.ZodOptional<z.ZodNumber>;
-        criticTimeout: z.ZodOptional<z.ZodNumber>;
     }, z.core.$strip>>>>;
 }, z.core.$strip>;
 /** Inferred type for service configuration. */

package/dist/schema/meta.d.ts

@@ -43,9 +43,6 @@ export declare const metaJsonSchema: z.ZodObject<{
         message: z.ZodString;
     }, z.core.$strip>>;
     _disabled: z.ZodOptional<z.ZodBoolean>;
-    _architectTimeout: z.ZodOptional<z.ZodNumber>;
-    _builderTimeout: z.ZodOptional<z.ZodNumber>;
-    _criticTimeout: z.ZodOptional<z.ZodNumber>;
     _ancestorBuilderHash: z.ZodOptional<z.ZodString>;
     _phaseState: z.ZodOptional<z.ZodObject<{
         architect: z.ZodEnum<{

package/dist/seed/createMeta.d.ts

@@ -11,12 +11,6 @@ export interface CreateMetaOptions {
     crossRefs?: string[];
     /** Steering prompt for the meta. */
     steer?: string;
-    /** Per-entity timeout override for the architect phase (seconds). */
-    architectTimeout?: number;
-    /** Per-entity timeout override for the builder phase (seconds). */
-    builderTimeout?: number;
-    /** Per-entity timeout override for the critic phase (seconds). */
-    criticTimeout?: number;
 }
 /** Result of creating a new meta. */
 export interface CreateMetaResult {

package/package.json

@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "@karmaniverous/jeeves": "^0.5.12",
-    "@karmaniverous/jeeves-meta-core": "^0.1.3",
+    "@karmaniverous/jeeves-meta-core": "^0.2.0",
     "commander": "^14",
     "croner": "^10",
     "fastify": "^5.8",
@@ -98,7 +98,7 @@
     "url": "git+https://github.com/karmaniverous/jeeves-meta.git"
   },
   "scripts": {
-    "build": "rimraf dist && cross-env NO_COLOR=1 rollup --config rollup.config.ts --configPlugin @rollup/plugin-typescript",
+    "build": "rimraf dist && cross-env NO_COLOR=1 rollup --config rollup.config.ts --configPlugin \"@rollup/plugin-typescript={outputToFilesystem:true}\"",
     "changelog": "git-cliff -o CHANGELOG.md",
     "knip": "knip",
     "lint": "eslint .",
@@ -110,5 +110,5 @@
   },
   "type": "module",
   "types": "dist/index.d.ts",
-  "version": "0.15.11"
+  "version": "0.16.0"
 }