@namzu/cli 34.1.1 → 35.0.0

package/dist/tui/agent.js

@@ -25,7 +25,7 @@ import { countListedResults, webActivityFromInput, webActivityKind, webCallTitle
  * `emptySession()` whose `send()` yields a single error event so the UI
  * renders an actionable hint rather than crashing.
  */
-import { BOOT_EVENT_NAMES, BackgroundJobRegistry, DiskSessionCheckpointStore, DiskSessionLog, DiskTaskStore, EVENT_NAME_ATTRIBUTE, GuardedFetchProvider, InMemorySessionLog, MarkdownMemoryStore, PromptContributionRegistry, ProviderRegistry, SCHEDULE_TOOL_NAME, SESSION_GOAL_TOOL_NAMES, SearchToolsTool, SessionPaths, ToolManager, WebFetchTool, abandonTurn, batchNeedsReview, buildAskUserQuestionTool, buildMemoryTools, buildResidentHistoryTools, buildResidentToolEvidenceTools, buildSessionGoalTools, compactNow, compactSession, computerUseUnavailableReason, createBrowserTools, createComputerUseTool, createFileReadTracker, createMemoryPromoter, createMemoryRecallStep, createResidentStepContext, createResidentStepContributions, createReviewHandler, createSkillTool, createToolPresenter, deferred, ensureProject, filtered, generateSessionId, generateTenantId, generateTopicId, generateTurnId, getBuiltinTools, isReviewExempt, isTurnInProgressError, mapTools, query, resolveContextWindow, resumeSession, seedObservationLedger, toolset, webGuidanceContribution, withProviderFallback, wrapUntrusted, } from '@namzu/sdk';
+import { BOOT_EVENT_NAMES, BackgroundJobRegistry, DiskSessionCheckpointStore, DiskSessionLog, DiskTaskStore, EVENT_NAME_ATTRIBUTE, GuardedFetchProvider, InMemorySessionLog, MarkdownMemoryStore, PromptContributionRegistry, ProviderRegistry, SCHEDULE_TOOL_NAME, SESSION_GOAL_TOOL_NAMES, SearchToolsTool, SessionPaths, ToolManager, WebFetchTool, abandonTurn, batchNeedsReview, bindOwner, buildAskUserQuestionTool, buildMemoryTools, buildResidentHistoryTools, buildResidentToolEvidenceTools, buildSessionGoalTools, compactNow, compactSession, computerUseUnavailableReason, createBrowserTools, createComputerUseTool, createFileReadTracker, createMemoryPromoter, createMemoryRecallStep, createResidentStepContext, createResidentStepContributions, createReviewHandler, createSkillTool, createToolPresenter, deferred, ensureProject, filtered, generateSessionId, generateTenantId, generateTopicId, generateTurnId, getBuiltinTools, isReviewExempt, isTurnInProgressError, mapTools, query, resolveContextWindow, resumeSession, seedObservationLedger, toolset, webGuidanceContribution, withProviderFallback, wrapUntrusted, } from '@namzu/sdk';
 import { SubprocessComputerUseHost } from '@namzu/computer-use';
 import { realpath, stat } from 'node:fs/promises';
 import { parse, resolve } from 'node:path';
@@ -508,6 +508,21 @@ function buildBaseToolsets(paths, backgroundJobs) {
     // after runtime tools are registered. Ordinary CLI task tools are active.
     return { builtin, memory, memoryStore, memoryDirectory: directory };
 }
+function clipRequestContext(prompt, limit, kind) {
+    if (!Number.isFinite(limit) || prompt.length <= limit)
+        return prompt;
+    const notice = `\n[Further ${kind} text omitted for this request.]`;
+    if (limit < notice.length + 64)
+        return null;
+    let end = Math.floor(limit) - notice.length;
+    // Do not leave half of a Unicode supplementary character at the boundary.
+    if (end > 0 && /[\uD800-\uDBFF]/.test(prompt[end - 1] ?? ''))
+        end--;
+    const lineEnd = prompt.lastIndexOf('\n', end);
+    if (lineEnd > end / 2)
+        end = lineEnd;
+    return prompt.slice(0, end).trimEnd() + notice;
+}
 export async function createAgentSession(prefs, detected, options = {}) {
     const fileObservations = new Map();
     /**
@@ -951,6 +966,7 @@ export async function createAgentSession(prefs, detected, options = {}) {
     // runs on the host and must not sit beside a sandbox in one tool context.
     const jobRegistry = backgroundJobs ? new BackgroundJobRegistry() : undefined;
     const jobOwner = scope.sessionId;
+    const ownedJobs = jobRegistry ? bindOwner(jobRegistry, jobOwner) : undefined;
     // Session-scoped and mutable: `/add-dir` adds to it, and every turn reads
     // it fresh — the query, the sandbox binds and the environment prompt.
     const directories = [];
@@ -1007,6 +1023,50 @@ export async function createAgentSession(prefs, detected, options = {}) {
             };
         }
     };
+    // File-backed memory and the stored index can contain text written by a
+    // model or its tools. Admit their bounded snapshot after optional recalls
+    // and model selection, without copying it into history.
+    const memoryContextSteps = (filePrompt, storedPrompt) => filePrompt || storedPrompt
+        ? [
+            ({ prepared, contextBudget }) => {
+                // One character per remaining token is conservative relative to the
+                // kernel's estimate and leaves room for response and later recall.
+                const budget = contextBudget
+                    ? Math.max(0, Math.floor(contextBudget.remainingTokens) - 100)
+                    : Number.POSITIVE_INFINITY;
+                let fileLimit = filePrompt
+                    ? Math.max(0, Math.min(filePrompt.length, storedPrompt ? Math.floor((budget - 2) / 2) : budget))
+                    : 0;
+                const storedLimit = storedPrompt
+                    ? Math.max(0, Math.min(storedPrompt.length, budget - fileLimit - (filePrompt ? 2 : 0)))
+                    : 0;
+                if (filePrompt && storedPrompt)
+                    fileLimit = Math.max(0, Math.min(filePrompt.length, budget - storedLimit - 2));
+                const block = [
+                    filePrompt ? clipRequestContext(filePrompt, fileLimit, 'memory') : null,
+                    storedPrompt ? clipRequestContext(storedPrompt, storedLimit, 'memory') : null,
+                ]
+                    .filter(Boolean)
+                    .join('\n\n');
+                return block
+                    ? { context: [prepared.context, block].filter(Boolean).join('\n\n') }
+                    : undefined;
+            },
+        ]
+        : [];
+    const extraContextSteps = (prompt) => prompt
+        ? [
+            ({ prepared, contextBudget }) => {
+                const limit = contextBudget
+                    ? Math.max(0, Math.floor(contextBudget.remainingTokens) - 100)
+                    : Number.POSITIVE_INFINITY;
+                const block = clipRequestContext(prompt, limit, 'context');
+                return block
+                    ? { context: [prepared.context, block].filter(Boolean).join('\n\n') }
+                    : undefined;
+            },
+        ]
+        : [];
     // Package presence is not tool reachability. The CLI used to probe and
     // report @namzu/computer-use without ever constructing its host or mounting
     // SDK's computer_use definition, so even an installed, healthy package was
@@ -1919,9 +1979,7 @@ export async function createAgentSession(prefs, detected, options = {}) {
         const storedMemory = await storedMemoryPrompt();
         if (storedMemory.notice)
             cliLogger().warn(storedMemory.notice);
-        const memoryPrompt = [composeMemoryPrompt(curatedMemory), storedMemory.prompt]
-            .filter((part) => Boolean(part))
-            .join('\n\n') || null;
+        const curatedMemoryPrompt = composeMemoryPrompt(curatedMemory);
         const environmentPrompt = composeEnvironmentPrompt({
             ...(await readEnvironmentFacts(cwd)),
             additionalDirectories: [...directories],
@@ -1935,7 +1993,6 @@ export async function createAgentSession(prefs, detected, options = {}) {
             NAMZU_DELEGATION_DOCTRINE,
             options.conversationSessions ? CONVERSATION_EVIDENCE_GUIDANCE : undefined,
             environmentPrompt,
-            memoryPrompt,
             systemNote,
             turnSkills.overflowNote,
         ]
@@ -2026,6 +2083,7 @@ export async function createAgentSession(prefs, detected, options = {}) {
                         ]),
                     ...(options.conversationSessions ? [createContextInventoryStep()] : []),
                     ...evidenceRecallFor(entry.sessionId),
+                    ...memoryContextSteps(curatedMemoryPrompt, storedMemory.prompt),
                 ],
                 ...(options.compaction?.consolidate
                     ? { consolidateInto: memoryStore }
@@ -2242,7 +2300,13 @@ export async function createAgentSession(prefs, detected, options = {}) {
         agentIds: allowedAgentIds,
         currentTaskStore,
         resetTaskStore,
-        jobs: () => jobRegistry?.list(jobOwner) ?? [],
+        jobs: () => ownedJobs?.list() ?? [],
+        ...(ownedJobs
+            ? {
+                readJob: (id, fromOffset) => ownedJobs.read(id, fromOffset === undefined ? {} : { fromOffset }),
+                stopJob: (id) => ownedJobs.kill(id),
+            }
+            : {}),
         ...(options.hooks ? { hooks: options.hooks } : {}),
         checkpoints,
         directories: sessionDirectories,
@@ -2419,9 +2483,7 @@ export async function createAgentSession(prefs, detected, options = {}) {
                         shed: false,
                     };
                 }
-                const memoryPrompt = [composeMemoryPrompt(curatedMemory), storedMemory.prompt]
-                    .filter((part) => Boolean(part))
-                    .join('\n\n') || null;
+                const curatedMemoryPrompt = composeMemoryPrompt(curatedMemory);
                 currentOnQuestion = opts?.onQuestion;
                 const [environmentFacts, turnSnapshot] = await Promise.all([
                     readEnvironmentFacts(cwd),
@@ -2523,7 +2585,7 @@ export async function createAgentSession(prefs, detected, options = {}) {
                     for (const contribution of bundle.contributions)
                         promptContributions.register(contribution);
                     // These are invocation snapshots, not the stable working policy.
-                    const invocationContext = [environmentPrompt, memoryPrompt, opts?.extraSystem]
+                    const invocationContext = [environmentPrompt, opts?.extraSystem]
                         .filter((text) => Boolean(text))
                         .join('\n\n');
                     promptContributions.register({
@@ -2552,7 +2614,6 @@ export async function createAgentSession(prefs, detected, options = {}) {
                         ? NAMZU_PLAN_MODE_DOCTRINE
                         : undefined,
                     residentContext ? undefined : environmentPrompt,
-                    residentContext ? undefined : memoryPrompt,
                     residentContext ? undefined : opts?.extraSystem,
                     residentContext ? undefined : opts?.systemNote,
                     turnSkills.overflowNote,
@@ -2653,6 +2714,9 @@ export async function createAgentSession(prefs, detected, options = {}) {
                         prepareStep: [
                             createTaskContextStep(turnTaskStore, turnScope.tenantId),
                             ...savedAgentsSteps(turnScope.sessionId),
+                            // A host-supplied resident step may select the request model.
+                            // Run it before every budgeted recall and memory admission.
+                            ...(options.residentEvidenceRecall ? [options.residentEvidenceRecall] : []),
                             ...(options.memory?.recall === false
                                 ? []
                                 : [
@@ -2664,7 +2728,8 @@ export async function createAgentSession(prefs, detected, options = {}) {
                                 ]),
                             ...(options.conversationSessions ? [createContextInventoryStep()] : []),
                             ...evidenceRecallFor(turnScope.sessionId),
-                            ...(options.residentEvidenceRecall ? [options.residentEvidenceRecall] : []),
+                            ...extraContextSteps(opts?.extraContext),
+                            ...memoryContextSteps(curatedMemoryPrompt, storedMemory.prompt),
                         ],
                         taskStore: turnTaskStore,
                         systemPrompt,
@@ -3233,6 +3298,7 @@ async function* runTurn({ retainedToolPreviewChars, fileReadTracker, provider, c
             compactionConfig,
             ...(consolidateInto ? { consolidateInto } : {}),
             ...(backgroundJobs ? { backgroundJobs, backgroundJobOwner } : {}),
+            ...(opts?.onJobNoticeDelivered ? { onJobNoticeDelivered: opts.onJobNoticeDelivered } : {}),
             turnConfig: {
                 model,
                 ...(sandboxProvider ? { sandbox: { workspace: sandboxWorkspace } } : {}),