@namzu/cli 12.1.0 → 13.0.0

package/dist/commands/prior-messages.js

@@ -0,0 +1,280 @@
+import { isCompactionMessage, isProjectInstructionMessageSource, isWorkingMemoryMessage, } from '@namzu/sdk';
+const isObject = (value) => typeof value === 'object' && value !== null && !Array.isArray(value);
+const isFiniteNumber = (value) => typeof value === 'number' && Number.isFinite(value);
+function optional(value, key, path, accepts, expected) {
+    const candidate = value[key];
+    return candidate === undefined || accepts(candidate) ? null : `${path}.${key} must be ${expected}`;
+}
+function stringField(value, key, path) {
+    return typeof value[key] === 'string' ? null : `${path}.${key} must be a string`;
+}
+function validateCommon(value, path) {
+    return (optional(value, 'timestamp', path, isFiniteNumber, 'a finite number') ??
+        optional(value, 'cacheHint', path, (candidate) => candidate === 'cache' || candidate === 'ephemeral' || candidate === 'none', '"cache", "ephemeral", or "none"') ??
+        optional(value, 'retain', path, (candidate) => typeof candidate === 'boolean', 'a boolean'));
+}
+function validateAttachment(value, path) {
+    if (!isObject(value))
+        return `${path} must be an attachment object`;
+    const type = value.type;
+    if (type === 'stored') {
+        return `${path} is a stored attachment reference, but stateless run-stream has no attachment store; send inline data instead`;
+    }
+    if (type === 'document') {
+        return (stringField(value, 'data', path) ??
+            stringField(value, 'mediaType', path) ??
+            optional(value, 'name', path, (candidate) => typeof candidate === 'string', 'a string') ??
+            optional(value, 'citations', path, (candidate) => typeof candidate === 'boolean', 'a boolean'));
+    }
+    if (type !== undefined && type !== 'image') {
+        return `${path}.type must be "image", "document", "stored", or absent`;
+    }
+    return stringField(value, 'data', path) ?? stringField(value, 'mediaType', path);
+}
+function validateAttachments(value, path) {
+    if (!Array.isArray(value))
+        return `${path} must be an array`;
+    for (let index = 0; index < value.length; index++) {
+        const error = validateAttachment(value[index], `${path}[${index}]`);
+        if (error)
+            return error;
+    }
+    return null;
+}
+function validateUserSource(value, path) {
+    if (!isObject(value))
+        return `${path} must be a source object`;
+    if (value.type === 'project-instructions') {
+        return isProjectInstructionMessageSource(value)
+            ? null
+            : `${path} must contain unique canonical project-relative AGENTS.md paths`;
+    }
+    if (value.type !== 'goal-round') {
+        return `${path}.type must be "goal-round" or "project-instructions"`;
+    }
+    return (stringField(value, 'goalId', path) ??
+        stringField(value, 'objective', path) ??
+        (isFiniteNumber(value.goalRevision) ? null : `${path}.goalRevision must be a finite number`) ??
+        (isFiniteNumber(value.round) ? null : `${path}.round must be a finite number`) ??
+        (isFiniteNumber(value.maxGoalRounds) ? null : `${path}.maxGoalRounds must be a finite number`));
+}
+function validateAssistantSource(value, path) {
+    if (!isObject(value))
+        return `${path} must be a source object`;
+    if (value.type !== 'model')
+        return `${path}.type must be "model"`;
+    return (stringField(value, 'providerId', path) ??
+        stringField(value, 'model', path) ??
+        (Number.isSafeInteger(value.chainIndex) && value.chainIndex >= 0
+            ? null
+            : `${path}.chainIndex must be a non-negative safe integer`));
+}
+function validateToolCall(value, path) {
+    if (!isObject(value))
+        return `${path} must be a tool-call object`;
+    const fn = value.function;
+    if (!isObject(fn))
+        return `${path}.function must be an object`;
+    const metadata = value.metadata;
+    return (stringField(value, 'id', path) ??
+        (value.type === 'function' ? null : `${path}.type must be "function"`) ??
+        stringField(fn, 'name', `${path}.function`) ??
+        stringField(fn, 'arguments', `${path}.function`) ??
+        (metadata === undefined
+            ? null
+            : !isObject(metadata)
+                ? `${path}.metadata must be an object`
+                : (optional(metadata, 'inputTruncated', `${path}.metadata`, (candidate) => typeof candidate === 'boolean', 'a boolean') ??
+                    optional(metadata, 'partialArguments', `${path}.metadata`, (candidate) => typeof candidate === 'string', 'a string'))));
+}
+function validateReasoning(value, path) {
+    if (!isObject(value))
+        return `${path} must be a reasoning object`;
+    return ((value.type === 'thinking' || value.type === 'redacted_thinking'
+        ? null
+        : `${path}.type must be "thinking" or "redacted_thinking"`) ??
+        optional(value, 'text', path, (candidate) => typeof candidate === 'string', 'a string') ??
+        optional(value, 'signature', path, (candidate) => typeof candidate === 'string', 'a string') ??
+        optional(value, 'encrypted', path, (candidate) => typeof candidate === 'string', 'a string'));
+}
+function validateCitation(value, path) {
+    if (!isObject(value))
+        return `${path} must be a citation object`;
+    const location = value.location;
+    if (!isObject(location))
+        return `${path}.location must be an object`;
+    return (stringField(value, 'citedText', path) ??
+        (isFiniteNumber(value.documentIndex)
+            ? null
+            : `${path}.documentIndex must be a finite number`) ??
+        optional(value, 'documentTitle', path, (candidate) => typeof candidate === 'string', 'a string') ??
+        (location.kind === 'page' || location.kind === 'char' || location.kind === 'block'
+            ? null
+            : `${path}.location.kind must be "page", "char", or "block"`) ??
+        (isFiniteNumber(location.start) ? null : `${path}.location.start must be a finite number`) ??
+        (isFiniteNumber(location.end) ? null : `${path}.location.end must be a finite number`));
+}
+function validateToolResultBlock(value, path) {
+    if (!isObject(value))
+        return `${path} must be a tool-result block object`;
+    if (value.type === 'text')
+        return stringField(value, 'text', path);
+    if (value.type === 'image') {
+        return stringField(value, 'data', path) ?? stringField(value, 'mediaType', path);
+    }
+    if (value.type === 'document')
+        return validateAttachment(value, path);
+    return `${path}.type must be "text", "image", or "document"`;
+}
+function validateMessage(value, index) {
+    const path = `messages[${index}]`;
+    if (!isObject(value))
+        return `${path} must be an object`;
+    const common = validateCommon(value, path);
+    if (common)
+        return common;
+    if (value.role === 'system') {
+        if (typeof value.content !== 'string')
+            return `${path}.content must be a string`;
+        return isCompactionMessage(value.content) || isWorkingMemoryMessage(value.content)
+            ? null
+            : `${path} is an arbitrary system prompt; stateless history accepts only compacted or working-memory conversation state`;
+    }
+    if (value.role === 'user') {
+        if (typeof value.content !== 'string')
+            return `${path}.content must be a string`;
+        return ((value.attachments === undefined
+            ? null
+            : validateAttachments(value.attachments, `${path}.attachments`)) ??
+            (value.source === undefined ? null : validateUserSource(value.source, `${path}.source`)));
+    }
+    if (value.role === 'assistant') {
+        if (typeof value.content !== 'string' && value.content !== null) {
+            return `${path}.content must be a string or null`;
+        }
+        if (value.toolCalls !== undefined) {
+            if (!Array.isArray(value.toolCalls))
+                return `${path}.toolCalls must be an array`;
+            for (let callIndex = 0; callIndex < value.toolCalls.length; callIndex++) {
+                const error = validateToolCall(value.toolCalls[callIndex], `${path}.toolCalls[${callIndex}]`);
+                if (error)
+                    return error;
+            }
+        }
+        if (value.reasoning !== undefined) {
+            if (!Array.isArray(value.reasoning))
+                return `${path}.reasoning must be an array`;
+            for (let reasoningIndex = 0; reasoningIndex < value.reasoning.length; reasoningIndex++) {
+                const error = validateReasoning(value.reasoning[reasoningIndex], `${path}.reasoning[${reasoningIndex}]`);
+                if (error)
+                    return error;
+            }
+        }
+        if (value.citations !== undefined) {
+            if (!Array.isArray(value.citations))
+                return `${path}.citations must be an array`;
+            for (let citationIndex = 0; citationIndex < value.citations.length; citationIndex++) {
+                const error = validateCitation(value.citations[citationIndex], `${path}.citations[${citationIndex}]`);
+                if (error)
+                    return error;
+            }
+        }
+        return value.source === undefined
+            ? null
+            : validateAssistantSource(value.source, `${path}.source`);
+    }
+    if (value.role === 'tool') {
+        if (typeof value.content !== 'string') {
+            if (!Array.isArray(value.content)) {
+                return `${path}.content must be a string or tool-result block array`;
+            }
+            for (let blockIndex = 0; blockIndex < value.content.length; blockIndex++) {
+                const error = validateToolResultBlock(value.content[blockIndex], `${path}.content[${blockIndex}]`);
+                if (error)
+                    return error;
+            }
+        }
+        return (stringField(value, 'toolCallId', path) ??
+            optional(value, 'isError', path, (candidate) => typeof candidate === 'boolean', 'a boolean'));
+    }
+    return `${path}.role must be "system", "user", "assistant", or "tool"`;
+}
+function validateSequence(messages) {
+    const seenCallIds = new Set();
+    let pending = null;
+    let sawConversation = false;
+    for (let index = 0; index < messages.length; index++) {
+        const message = messages[index];
+        if (!message)
+            continue;
+        if (pending) {
+            if (message.role !== 'tool') {
+                return `messages[${index}] cannot appear before every tool call from messages[${pending.openedAt}] has a result`;
+            }
+            if (!pending.ids.has(message.toolCallId)) {
+                return `messages[${index}].toolCallId does not match an unanswered call from messages[${pending.openedAt}]`;
+            }
+            pending.ids.delete(message.toolCallId);
+            if (pending.ids.size === 0)
+                pending = null;
+            continue;
+        }
+        if (message.role === 'system') {
+            if (sawConversation)
+                return `messages[${index}] is a system message after conversation began`;
+            continue;
+        }
+        if (!sawConversation) {
+            sawConversation = true;
+            if (message.role !== 'user') {
+                return `messages[${index}] must be a user message at the start of conversation history`;
+            }
+        }
+        if (message.role === 'tool')
+            return `messages[${index}] is a tool result with no pending call`;
+        if (message.role !== 'assistant' || !message.toolCalls || message.toolCalls.length === 0) {
+            continue;
+        }
+        const ids = new Set();
+        for (let callIndex = 0; callIndex < message.toolCalls.length; callIndex++) {
+            const id = message.toolCalls[callIndex]?.id;
+            if (!id)
+                continue;
+            if (seenCallIds.has(id) || ids.has(id)) {
+                return `messages[${index}].toolCalls[${callIndex}].id duplicates tool call id "${id}"`;
+            }
+            ids.add(id);
+            seenCallIds.add(id);
+        }
+        pending = { openedAt: index, ids };
+    }
+    if (pending) {
+        return `messages[${pending.openedAt}] has tool calls without immediate results for: ${[...pending.ids].join(', ')}`;
+    }
+    return null;
+}
+/** Parse the stateless stdin contract without dropping or inventing message fields. */
+export function parsePriorMessages(raw) {
+    const trimmed = raw.trim();
+    if (!trimmed)
+        return { ok: true, messages: [] };
+    let parsed;
+    try {
+        parsed = JSON.parse(trimmed);
+    }
+    catch {
+        return { ok: false, error: 'stdin history is not valid JSON' };
+    }
+    if (!Array.isArray(parsed)) {
+        return { ok: false, error: 'stdin history must be a JSON Message[] array' };
+    }
+    for (let index = 0; index < parsed.length; index++) {
+        const error = validateMessage(parsed[index], index);
+        if (error)
+            return { ok: false, error };
+    }
+    const messages = parsed;
+    const sequenceError = validateSequence(messages);
+    return sequenceError ? { ok: false, error: sequenceError } : { ok: true, messages };
+}
+//# sourceMappingURL=prior-messages.js.map

package/dist/commands/prior-messages.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"prior-messages.js","sourceRoot":"","sources":["../../src/commands/prior-messages.ts"],"names":[],"mappings":"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"}

package/dist/commands/resume.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resume.d.ts","sourceRoot":"","sources":["../../src/commands/resume.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAEzC,OAAO,EACN,KAAK,WAAW,EAIhB,MAAM,mCAAmC,CAAA;AAE1C,MAAM,WAAW,aAAa;IAC7B,oEAAoE;IACpE,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAA;IAC9B,wDAAwD;IACxD,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;CACjC;AAED,MAAM,MAAM,aAAa,GACtB;IAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAA;CAAE,GAC1B;IAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,SAAS,OAAO,EAAE,CAAA;CAAE,GAC/F;IAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAA;AAEvD;;;;;;GAMG;AACH,wBAAsB,aAAa,CAClC,QAAQ,EAAE,WAAW,GAAG,IAAI,EAC5B,OAAO,EAAE,aAAa,EACtB,GAAG,EAAE,MAAM,GACT,OAAO,CAAC,aAAa,CAAC,CA6CxB"}
+{"version":3,"file":"resume.d.ts","sourceRoot":"","sources":["../../src/commands/resume.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAEzC,OAAO,EACN,KAAK,WAAW,EAIhB,MAAM,mCAAmC,CAAA;AAE1C,MAAM,WAAW,aAAa;IAC7B,oEAAoE;IACpE,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAA;IAC9B,wDAAwD;IACxD,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;CACjC;AAED,MAAM,MAAM,aAAa,GACtB;IAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAA;CAAE,GAC1B;IAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,SAAS,OAAO,EAAE,CAAA;CAAE,GAC/F;IAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAA;AAEvD;;;;;;GAMG;AACH,wBAAsB,aAAa,CAClC,QAAQ,EAAE,WAAW,GAAG,IAAI,EAC5B,OAAO,EAAE,aAAa,EACtB,GAAG,EAAE,MAAM,GACT,OAAO,CAAC,aAAa,CAAC,CA4CxB"}

package/dist/commands/resume.js

@@ -31,7 +31,7 @@
  * If that is what you want, run the command with no flag. The absence of a
  * thing must not be spellable as a silent widening of it.
  */
-import { listRecent, loadConversation, } from '../integrations/sessions/store.js';
+import { listRecent, loadResumableConversation, } from '../integrations/sessions/store.js';
 /**
  * Resolve what a `--continue` / `--resume` asked for.
  *
@@ -54,8 +54,17 @@ export async function resolveResume(sessions, request, cwd) {
             message: `no conversation store in ${cwd} — it could not be opened, so there is nothing to resume`,
         };
     }
-    const recent = await listRecent(sessions, 50);
     if (request.continueLast) {
+        let recent;
+        try {
+            recent = await listRecent(sessions, 50);
+        }
+        catch (err) {
+            return {
+                kind: 'error',
+                message: `conversations in ${cwd} cannot be resumed: ${err instanceof Error ? err.message : String(err)}`,
+            };
+        }
         const latest = recent[0];
         if (!latest) {
             // Its own sentence, because the cause is different from a bad id and
@@ -66,25 +75,18 @@ export async function resolveResume(sessions, request, cwd) {
                 message: `no previous conversation in ${cwd} — run without --continue to start one, or pass --cwd if you meant a different directory`,
             };
         }
-        return await load(sessions, latest);
+        return await load(sessions, latest.id, cwd);
     }
     const wanted = request.sessionId;
-    const match = recent.find((c) => c.id === wanted);
-    if (!match) {
-        const known = recent.length;
-        return {
-            kind: 'error',
-            message: known === 0
-                ? `no conversation "${wanted}" in ${cwd}, and no others either — pass --cwd if you meant a different directory`
-                : `no conversation "${wanted}" in ${cwd}. ${known} other${known === 1 ? '' : 's'} here; \`namzu history\` lists them`,
-        };
-    }
-    return await load(sessions, match);
+    // An exact id is not a request for a row in the recent picker. The previous
+    // implementation searched a 50-row list, so the 51st valid conversation was
+    // reported missing even though its durable record was intact.
+    return await load(sessions, wanted, cwd);
 }
-async function load(sessions, conversation) {
+async function load(sessions, sessionId, cwd) {
     let messages;
     try {
-        messages = await loadConversation(sessions, conversation.id);
+        messages = await loadResumableConversation(sessions, sessionId);
     }
     catch (err) {
         // Reading the transcript failed after the conversation was found. NOT
@@ -93,15 +95,15 @@ async function load(sessions, conversation) {
         // session that had been resumed.
         return {
             kind: 'error',
-            message: `conversation "${conversation.id}" could not be read: ${err instanceof Error ? err.message : String(err)}`,
+            message: `conversation "${sessionId}" could not be resumed in ${cwd}: ${err instanceof Error ? err.message : String(err)}`,
         };
     }
     if (messages.length === 0) {
         return {
             kind: 'error',
-            message: `conversation "${conversation.id}" has no messages to resume — its transcript is empty`,
+            message: `conversation "${sessionId}" has no messages to resume — its transcript is empty`,
         };
     }
-    return { kind: 'resumed', sessionId: conversation.id, messages };
+    return { kind: 'resumed', sessionId, messages };
 }
 //# sourceMappingURL=resume.js.map

package/dist/commands/resume.js.map

@@ -1 +1 @@
-{"version":3,"file":"resume.js","sourceRoot":"","sources":["../../src/commands/resume.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resume.js","sourceRoot":"","sources":["../../src/commands/resume.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AAIH,OAAO,EAGN,UAAU,EACV,yBAAyB,GACzB,MAAM,mCAAmC,CAAA;AAc1C;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAClC,QAA4B,EAC5B,OAAsB,EACtB,GAAW;IAEX,IAAI,CAAC,OAAO,CAAC,YAAY,IAAI,CAAC,OAAO,CAAC,SAAS;QAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAA;IACzE,IAAI,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;QAC/C,OAAO;YACN,IAAI,EAAE,OAAO;YACb,OAAO,EACN,wIAAwI;SACzI,CAAA;IACF,CAAC;IACD,IAAI,CAAC,QAAQ,EAAE,CAAC;QACf,OAAO;YACN,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,4BAA4B,GAAG,0DAA0D;SAClG,CAAA;IACF,CAAC;IAED,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;QAC1B,IAAI,MAA4B,CAAA;QAChC,IAAI,CAAC;YACJ,MAAM,GAAG,MAAM,UAAU,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;QACxC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACd,OAAO;gBACN,IAAI,EAAE,OAAO;gBACb,OAAO,EAAE,oBAAoB,GAAG,uBAAuB,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;aACzG,CAAA;QACF,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;QACxB,IAAI,CAAC,MAAM,EAAE,CAAC;YACb,qEAAqE;YACrE,qEAAqE;YACrE,6DAA6D;YAC7D,OAAO;gBACN,IAAI,EAAE,OAAO;gBACb,OAAO,EAAE,+BAA+B,GAAG,0FAA0F;aACrI,CAAA;QACF,CAAC;QACD,OAAO,MAAM,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,CAAA;IAC5C,CAAC;IAED,MAAM,MAAM,GAAG,OAAO,CAAC,SAAmB,CAAA;IAC1C,4EAA4E;IAC5E,4EAA4E;IAC5E,8DAA8D;IAC9D,OAAO,MAAM,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,CAAC,CAAA;AACzC,CAAC;AAED,KAAK,UAAU,IAAI,CAAC,QAAqB,EAAE,SAAiB,EAAE,GAAW;IACxE,IAAI,QAA4B,CAAA;IAChC,IAAI,CAAC;QACJ,QAAQ,GAAG,MAAM,yBAAyB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAA;IAChE,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACd,sEAAsE;QACtE,gEAAgE;QAChE,kEAAkE;QAClE,iCAAiC;QACjC,OAAO;YACN,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,iBAAiB,SAAS,6BAA6B,GAAG,KAClE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAChD,EAAE;SACF,CAAA;IACF,CAAC;IACD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC3B,OAAO;YACN,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,iBAAiB,SAAS,uDAAuD;SAC1F,CAAA;IACF,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAA;AAChD,CAAC"}

package/dist/commands/run-stream.d.ts

@@ -9,9 +9,11 @@
  *
  * History: with `--session <key>` the turn is bound to a persisted
  * conversation in the cwd's `.namzu` store (keyed by the embedder's own
- * session id), so prior turns are loaded as context and the new
- * user+assistant pair is appended — that's what lets a reopened session show
- * its past messages (`namzu history --session <key>`). Without `--session`,
+ * session id), so prior turns are loaded as context and the kernel's exact
+ * settled conversation projection is published — including opaque reasoning
+ * and complete tool turns, excluding its fresh per-run system floor. That's
+ * what lets a reopened session show and replay its past messages (`namzu
+ * history --session <key>`). Without `--session`,
  * prior history may be supplied on stdin as a JSON `Message[]` and nothing is
  * persisted (stateless one-shot).
  *

package/dist/commands/run-stream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run-stream.d.ts","sourceRoot":"","sources":["../../src/commands/run-stream.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuDG;AA0BH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAuC5C,eAAO,MAAM,gBAAgB,EAAE,UA+T9B,CAAA;AAED,eAAO,MAAM,cAAc,EAAE,UAkD5B,CAAA;AAMD,eAAO,MAAM,iBAAiB,EAAE,UAqC/B,CAAA;AAOD,eAAO,MAAM,oBAAoB,EAAE,UA8ClC,CAAA"}
+{"version":3,"file":"run-stream.d.ts","sourceRoot":"","sources":["../../src/commands/run-stream.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyDG;AA8BH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAoB5C,eAAO,MAAM,gBAAgB,EAAE,UAiV9B,CAAA;AAED,eAAO,MAAM,cAAc,EAAE,UAkD5B,CAAA;AAMD,eAAO,MAAM,iBAAiB,EAAE,UAqC/B,CAAA;AAOD,eAAO,MAAM,oBAAoB,EAAE,UA8ClC,CAAA"}

package/dist/commands/run-stream.js

@@ -9,9 +9,11 @@
  *
  * History: with `--session <key>` the turn is bound to a persisted
  * conversation in the cwd's `.namzu` store (keyed by the embedder's own
- * session id), so prior turns are loaded as context and the new
- * user+assistant pair is appended — that's what lets a reopened session show
- * its past messages (`namzu history --session <key>`). Without `--session`,
+ * session id), so prior turns are loaded as context and the kernel's exact
+ * settled conversation projection is published — including opaque reasoning
+ * and complete tool turns, excluding its fresh per-run system floor. That's
+ * what lets a reopened session show and replay its past messages (`namzu
+ * history --session <key>`). Without `--session`,
  * prior history may be supplied on stdin as a JSON `Message[]` and nothing is
  * persisted (stateless one-shot).
  *
@@ -55,14 +57,17 @@
  * asked for rather than achieving it.
  */
 import { jsonLinesSink } from '@namzu/sdk';
+import { resolveTrustedProjectContext } from '../config/trusted-project-context.js';
 import { EXIT_FAIL, EXIT_OK, EXIT_UNTRUSTED } from '../exit-codes.js';
-import { appendMessages, loadConversation, openSessions, resolveConversation, } from '../integrations/sessions/store.js';
+import { appendMessages, loadConversation, openSessions, replaceConversation, resolveConversation, } from '../integrations/sessions/store.js';
 import { contextLogging, installCliLogging } from '../logging.js';
 import { decideHeadlessTrust } from '../permissions/headless-trust.js';
 import { resolvePermissionMode } from '../permissions/mode.js';
 import { compilePermissions } from '../permissions/rules.js';
+import { planTurnPublication } from '../tui/conversation-history.js';
 import { hostCommandNames } from '../tui/slashCommands.js';
 import { expandHeadlessCommand } from '../user-commands/store.js';
+import { parsePriorMessages } from './prior-messages.js';
 import { applyProviderFlags, buildGate, loadSkillsContext, parseRunFlags, resolveWorkingDirectory, unknownOptionMessage, } from './run-flags.js';
 async function readStdin() {
     if (process.stdin.isTTY)
@@ -75,34 +80,12 @@ async function readStdin() {
 function defaultPrefs(detected) {
     const first = detected[0];
     return first
-        ? { version: 3, providers: [{ id: first.entry.id }], subagents: { active: [] } }
-        : null;
-}
-/** Parse stdin as a prior Message[]; tolerate the UI's {role,content} shape. */
-function parsePriorMessages(raw) {
-    const trimmed = raw.trim();
-    if (!trimmed)
-        return [];
-    try {
-        const parsed = JSON.parse(trimmed);
-        if (!Array.isArray(parsed))
-            return [];
-        const out = [];
-        for (const m of parsed) {
-            if (!m || typeof m !== 'object')
-                continue;
-            const role = m.role;
-            const content = m.content;
-            if ((role === 'user' || role === 'assistant') && typeof content === 'string') {
-                const ts = m.timestamp;
-                out.push({ role, content, timestamp: typeof ts === 'number' ? ts : Date.now() });
-            }
+        ? {
+            version: 3,
+            providers: [{ id: first.entry.id }],
+            subagents: { active: [] },
         }
-        return out;
-    }
-    catch {
-        return [];
-    }
+        : null;
 }
 export const runStreamCommand = {
     name: 'run-stream',
@@ -121,6 +104,8 @@ export const runStreamCommand = {
         '',
         'History is bound with --session <id>. --continue and --resume are `run`',
         'options and are refused here rather than ignored.',
+        'Without --session, optional stdin must be one complete JSON Message[];',
+        'invalid or provider-incomplete tool history is refused before a run.',
         '',
         'The folder has to be trusted: run `namzu` here once and accept the',
         'prompt, or pass --trust for one run. An untrusted folder emits an error',
@@ -136,7 +121,8 @@ export const runStreamCommand = {
         'there, a conversation that cannot be opened); 77 when the folder has not',
         'been trusted, which only a person can change.',
     ].join('\n'),
-    handler: async ({ ctx, rawArgs }) => {
+    handler: async ({ ctx: bootstrapCtx, rawArgs }) => {
+        let ctx = bootstrapCtx;
         const write = (o) => {
             process.stdout.write(`${JSON.stringify(o)}\n`);
         };
@@ -179,26 +165,7 @@ export const runStreamCommand = {
         const resolved = resolveWorkingDirectory(flags.cwd);
         if ('error' in resolved)
             return fail(resolved.error);
-        const cwd = resolved.cwd;
-        // The same expansion `run` does. A host UI sending `/ozet x` on behalf of
-        // someone who defined that command should get the command, not the model
-        // improvising on the literal text.
-        const expansion = expandHeadlessCommand(prompt, {
-            cwd,
-            // Through the merge, so a kernel-registered command is refused or
-            // expanded here with the same vocabulary the interactive path
-            // uses. Mapping the local array left it unknown, and an unknown
-            // name goes to the model as prose.
-            builtins: hostCommandNames(),
-        });
-        // Two different refusals wear this one word. An interactive builtin named
-        // headlessly, or arguments handed to a template that takes none, are fixed
-        // by sending a different prompt. A command FILE that will not parse is not
-        // — and no prompt fixes a file.
-        if (expansion.kind === 'refused') {
-            return expansion.fixable ? fail(expansion.reason) : refuse(expansion.reason);
-        }
-        const finalPrompt = expansion.kind === 'expanded' ? expansion.prompt : prompt;
+        const requestedCwd = resolved.cwd;
         // Before the session store is opened, before anything is read or run in
         // that directory.
         //
@@ -209,12 +176,27 @@ export const runStreamCommand = {
         // a host that cannot tell the two apart will retry the one that must not
         // be retried — so the event carries the explanation and the exit code
         // carries the fact that nothing ran.
-        const trust = decideHeadlessTrust({ cwd, trustFlag: flags.trust });
+        const trust = decideHeadlessTrust({
+            cwd: requestedCwd,
+            trustFlag: flags.trust,
+        });
         if (!trust.allowed) {
             write({ kind: 'error', message: trust.message ?? 'folder not trusted' });
             write({ kind: 'done' });
             return EXIT_UNTRUSTED;
         }
+        const cwd = trust.cwd;
+        ctx = resolveTrustedProjectContext(bootstrapCtx, cwd);
+        // Project command discovery belongs behind the target folder's trust
+        // gate, alongside project config and instructions.
+        const expansion = expandHeadlessCommand(prompt, {
+            cwd,
+            builtins: hostCommandNames(),
+        });
+        if (expansion.kind === 'refused') {
+            return expansion.fixable ? fail(expansion.reason) : refuse(expansion.reason);
+        }
+        const finalPrompt = expansion.kind === 'expanded' ? expansion.prompt : prompt;
         // Resolve the persisted conversation (if a session key was given) so we
         // load prior turns as context and can append this turn afterward. Falls
         // back to stdin-supplied history when running stateless.
@@ -259,7 +241,10 @@ export const runStreamCommand = {
             }
         }
         if (!cli) {
-            prior = parsePriorMessages(await readStdin());
+            const parsed = parsePriorMessages(await readStdin());
+            if (!parsed.ok)
+                return fail(`invalid stdin history: ${parsed.error}`);
+            prior = [...parsed.messages];
         }
         // Always NDJSON on stderr, regardless of --log-format/NAMZU_LOG_FORMAT
         // — this is the machine-read channel §6.6 of the logging design
@@ -291,7 +276,7 @@ export const runStreamCommand = {
         });
         if ('error' in modeResult)
             return fail(modeResult.error);
-        const permissions = compilePermissions(ctx.config.permissions);
+        const permissions = compilePermissions(ctx.config.permissions, ctx.config.permissionChecks);
         for (const d of permissions.diagnostics) {
             const where = d.pattern ? `permissions.${d.tool}."${d.pattern}"` : `permissions.${d.tool}`;
             // In band, because a host line-scanning stdout has no other channel —
@@ -312,6 +297,8 @@ export const runStreamCommand = {
             ...(gate ?? {}),
             permissionMode: modeResult.mode,
             ...(ctx.config.mcpServers ? { mcpServers: ctx.config.mcpServers } : {}),
+            ...(ctx.config.plugins ? { plugins: ctx.config.plugins } : {}),
+            ...(ctx.config.sandbox ? { sandbox: ctx.config.sandbox } : {}),
         });
         if (!session.hasProvider) {
             await session.close();
@@ -359,8 +346,14 @@ export const runStreamCommand = {
         };
         const messages = [...prior, userMessage];
         let assistantText = '';
+        let conversationMessages;
         try {
-            for await (const event of session.send(messages, extraSystem ? { extraSystem } : undefined)) {
+            for await (const event of session.send(messages, {
+                ...(extraSystem ? { extraSystem } : {}),
+                onConversationMessages: (settled) => {
+                    conversationMessages = settled;
+                },
+            })) {
                 if (event.kind === 'delta')
                     assistantText += event.text;
                 write(event);
@@ -394,12 +387,23 @@ export const runStreamCommand = {
         // later reads are now incomplete.
         if (cli && conversationId) {
             try {
-                const assistant = {
-                    role: 'assistant',
-                    content: assistantText,
-                    timestamp: Date.now(),
-                };
-                await appendMessages(cli, conversationId, [userMessage, assistant]);
+                if (conversationMessages) {
+                    const publication = planTurnPublication(prior, userMessage, conversationMessages);
+                    if (publication.kind === 'replace') {
+                        await replaceConversation(cli, conversationId, publication.messages);
+                    }
+                    else {
+                        await appendMessages(cli, conversationId, publication.messages);
+                    }
+                }
+                else {
+                    const assistant = {
+                        role: 'assistant',
+                        content: assistantText,
+                        timestamp: Date.now(),
+                    };
+                    await appendMessages(cli, conversationId, [userMessage, assistant]);
+                }
             }
             catch (err) {
                 write({