@sagentlab/navarch-runtime 0.1.120 → 0.1.122

package/dist/session.cjs

@@ -529,7 +529,22 @@ async function runClaimedSession(deps, claimed, sessionId, lifecycle) {
         });
         const agentBudgetStartedAt = node_perf_hooks_1.performance.now();
         const maxRuntimeMs = task.max_runtime_ms ?? config.sessionTimeoutMs;
-        let nextPrompt = null;
+        // A correction turn in two forms: `full` restates the task brief for a
+        // fresh agent; `resumed` is only the correction, for an adapter that
+        // continues the previous turn's conversation (AgentAdapter.resumesTurns).
+        let nextCorrection = null;
+        // The conversation the next turn may resume, and the mid-flight guidance
+        // that conversation has already been sent.
+        let resumableSessionId;
+        let conversationGuidanceIds = new Set();
+        // Running usage totals the resumable conversation last reported, for the
+        // fields its adapter reports cumulatively (AgentAdapter.cumulativeResumeUsage).
+        let conversationUsage = {};
+        // Claim-time guidance is part of the brief (task_context's "Human
+        // guidance" section, lib/navarch/context.ts), so guidance turns carry only
+        // what arrived after the claim.
+        const briefGuidanceIds = new Set((bundle.guidance ?? []).map((entry) => entry.id));
+        const resumedTask = { id: task.id, summary: task.summary };
         let completionRemediationRetries = 0;
         let deliveryCorrectionRetries = 0;
         let deliveredPullRequest = false;
@@ -540,58 +555,85 @@ async function runClaimedSession(deps, claimed, sessionId, lifecycle) {
             // It is already included in deliveredGuidance, so clear the pending
             // notification and start the first turn with the corrected prompt.
             pendingGuidance = [];
-            activeAbortController = new AbortController();
+            const turnAbort = new AbortController();
+            activeAbortController = turnAbort;
             if (leaseLost || deps.shutdownSignal?.aborted)
-                activeAbortController.abort();
+                turnAbort.abort();
             // The task brief plus any mid-flight guidance. Correction turns build on
             // this rather than on the previous turn's prompt so they never nest.
-            const briefPrompt = deliveredGuidance.length > (bundle.guidance?.length ?? 0)
-                ? (0, prompt_cjs_1.renderGuidanceCorrectionPrompt)(promptText, deliveredGuidance)
+            const midFlightGuidance = deliveredGuidance.filter((entry) => !briefGuidanceIds.has(entry.id));
+            const briefPrompt = midFlightGuidance.length > 0
+                ? (0, prompt_cjs_1.renderGuidanceCorrectionPrompt)(promptText, midFlightGuidance)
                 : promptText;
-            const runPrompt = nextPrompt ?? briefPrompt;
-            nextPrompt = null;
-            await node_fs_1.promises.writeFile(node_path_1.default.join(workDir, "prompt.md"), runPrompt, "utf8");
+            const fullPrompt = nextCorrection ? nextCorrection.full(briefPrompt) : briefPrompt;
+            // Resume only to deliver something new: a correction, or guidance this
+            // conversation has not been sent. The brief is already in it.
+            const unsentGuidance = midFlightGuidance.filter((entry) => !conversationGuidanceIds.has(entry.id));
+            const resumeSessionId = adapter.resumesTurns && (nextCorrection || unsentGuidance.length > 0)
+                ? resumableSessionId
+                : undefined;
+            const resumedPrompt = resumeSessionId
+                ? nextCorrection
+                    ? [nextCorrection.resumed, ...(unsentGuidance.length > 0 ? [(0, prompt_cjs_1.renderMidFlightGuidanceSection)(unsentGuidance)] : [])].join("\n\n")
+                    : (0, prompt_cjs_1.renderResumedGuidancePrompt)(resumedTask, unsentGuidance)
+                : null;
+            nextCorrection = null;
             adapterStarted = true;
             adapterRunning = true;
             agentTurnStartedAt = Date.now();
             outputReportedAt = agentTurnStartedAt;
             outputUpdates = 0;
             reportActivity("running");
-            const remainingRuntimeMs = maxRuntimeMs > 0
-                ? maxRuntimeMs - (node_perf_hooks_1.performance.now() - agentBudgetStartedAt)
-                : 0;
-            const turnResult = maxRuntimeMs > 0 && remainingRuntimeMs <= 0
-                ? { exitCode: null, timedOut: true, timeoutReason: "duration", killedByLeaseLoss: false, stdout: "", stderr: "" }
-                : await (0, adapter_watchdog_cjs_1.runWithActivityWatchdog)(adapter, {
-                    prompt: runPrompt,
-                    mcpConfigPath,
-                    mcpMetadataDir: workDir,
-                    bin,
-                    extraArgs,
-                    model: execution.model,
-                    reasoningEffort: execution.reasoning_effort,
-                    timeoutMs: remainingRuntimeMs,
-                    env: sessionEnv,
-                    settingsPath: claudeSettingsPath,
-                    codexGuardArgs,
-                    antigravityHostGuard: runtime === "antigravity" && config.sandboxMode === "host" && config.worktreeGuard,
-                    antigravityResume,
-                    museHostGuard: config.sandboxMode === "host" && config.worktreeGuard,
-                    resumeSessionId: runtime === "muse" ? museSessionId : undefined,
-                    opencodeHostGuard: runtime === "opencode" && config.sandboxMode === "host" && config.worktreeGuard,
-                    // ACP requires an absolute session cwd. Docker mounts the worktree at
-                    // this same absolute path, while the other Docker adapters ignore cwd.
-                    cwd: gitWorktree.worktreePath,
-                    dockerExec: sandbox ? { containerName: sandbox.name, runner: sandbox_cjs_1.nodeCommandRunner } : undefined,
-                    signal: activeAbortController.signal,
-                    onActivity: () => { outputObservedAt = Date.now(); outputUpdates += 1; },
-                    onOutput: (stream, chunk) => {
-                        if (stream !== "stdout")
-                            return;
-                        liveStdout += chunk;
-                        liveTranscript?.markDirty();
-                    },
-                }, task.idle_timeout_ms ?? config.sessionIdleTimeoutMs ?? 45 * 60_000, runtime === "opencode" ? config.opencodeStartupTimeoutMs : 0);
+            const runTurn = async (prompt, resumeId) => {
+                // prompt.md records exactly what this invocation is sent.
+                await node_fs_1.promises.writeFile(node_path_1.default.join(workDir, "prompt.md"), prompt, "utf8");
+                const remainingRuntimeMs = maxRuntimeMs > 0
+                    ? maxRuntimeMs - (node_perf_hooks_1.performance.now() - agentBudgetStartedAt)
+                    : 0;
+                return maxRuntimeMs > 0 && remainingRuntimeMs <= 0
+                    ? { exitCode: null, timedOut: true, timeoutReason: "duration", killedByLeaseLoss: false, stdout: "", stderr: "" }
+                    : await (0, adapter_watchdog_cjs_1.runWithActivityWatchdog)(adapter, {
+                        prompt,
+                        mcpConfigPath,
+                        mcpMetadataDir: workDir,
+                        bin,
+                        extraArgs,
+                        model: execution.model,
+                        reasoningEffort: execution.reasoning_effort,
+                        timeoutMs: remainingRuntimeMs,
+                        env: sessionEnv,
+                        settingsPath: claudeSettingsPath,
+                        codexGuardArgs,
+                        antigravityHostGuard: runtime === "antigravity" && config.sandboxMode === "host" && config.worktreeGuard,
+                        antigravityResume,
+                        museHostGuard: config.sandboxMode === "host" && config.worktreeGuard,
+                        resumeSessionId: runtime === "muse" ? museSessionId : resumeId,
+                        opencodeHostGuard: runtime === "opencode" && config.sandboxMode === "host" && config.worktreeGuard,
+                        // ACP requires an absolute session cwd. Docker mounts the worktree at
+                        // this same absolute path, while the other Docker adapters ignore cwd.
+                        cwd: gitWorktree.worktreePath,
+                        dockerExec: sandbox ? { containerName: sandbox.name, runner: sandbox_cjs_1.nodeCommandRunner } : undefined,
+                        signal: turnAbort.signal,
+                        onActivity: () => { outputObservedAt = Date.now(); outputUpdates += 1; },
+                        onOutput: (stream, chunk) => {
+                            if (stream !== "stdout")
+                                return;
+                            liveStdout += chunk;
+                            liveTranscript?.markDirty();
+                        },
+                    }, task.idle_timeout_ms ?? config.sessionIdleTimeoutMs ?? 45 * 60_000, runtime === "opencode" ? config.opencodeStartupTimeoutMs : 0);
+            };
+            let turnResult = await runTurn(resumedPrompt ?? fullPrompt, resumeSessionId);
+            let resumed = Boolean(resumeSessionId);
+            if (resumeSessionId && turnResult.resumeRejected && !leaseLost && !turnAbort.signal.aborted) {
+                // The CLI refused the session before any work started (expired or
+                // unknown id). Nothing ran, so send the full brief to a fresh agent.
+                log.warn(`could not resume the agent conversation for ${leaseId} ` +
+                    `(${(0, redact_cjs_1.redactText)(turnResult.stderr.trim().slice(0, 300), registry.list())}); re-sending the full task brief.`);
+                liveStdout = "";
+                turnResult = await runTurn(fullPrompt, undefined);
+                resumed = false;
+            }
             activeAbortController = null;
             adapterRunning = false;
             if (turnResult.timedOut || leaseLost)
@@ -603,6 +645,34 @@ async function runClaimedSession(deps, claimed, sessionId, lifecycle) {
             antigravityResume = turnResult.antigravityResume;
             if (runtime === "muse")
                 museSessionId = turnResult.agentSessionId;
+            if (adapter.cumulativeResumeUsage) {
+                // A resumed run reports the conversation's running total: record only
+                // this turn's increase. A fresh conversation starts its own total.
+                if (!resumed)
+                    conversationUsage = {};
+                for (const key of adapter.cumulativeResumeUsage) {
+                    const total = turnResult[key];
+                    if (total === undefined)
+                        continue;
+                    turnResult[key] = Math.max(0, total - (conversationUsage[key] ?? 0));
+                    conversationUsage[key] = total;
+                }
+            }
+            if (adapter.resumesTurns) {
+                resumableSessionId = turnResult.resumeRejected ? undefined : turnResult.agentSessionId;
+                if (!resumableSessionId) {
+                    conversationGuidanceIds = new Set();
+                }
+                else if (resumed) {
+                    for (const entry of unsentGuidance)
+                        conversationGuidanceIds.add(entry.id);
+                }
+                else {
+                    // A fresh conversation was sent the full brief, which carries every
+                    // mid-flight guidance entry received so far.
+                    conversationGuidanceIds = new Set(midFlightGuidance.map((entry) => entry.id));
+                }
+            }
             attempts.push(turnResult);
             liveStdout = "";
             liveTranscript.markDirty();
@@ -735,14 +805,18 @@ async function runClaimedSession(deps, claimed, sessionId, lifecycle) {
                         deliveryCorrectionRetries += 1;
                         log.warn(`session ${leaseId} finished without delivering (${delivery.reason}); ` +
                             `restarting agent turn ${deliveryCorrectionRetries}/${DELIVERY_CORRECTION_RETRIES} in the same worktree.`);
-                        nextPrompt = (0, delivery_cjs_1.renderDeliveryCorrectionPrompt)({
-                            originalPrompt: briefPrompt,
+                        const correction = {
                             taskType: task.task_type,
-                            previousReport: previousTurnReport(),
                             reason: delivery.reason,
                             attempt: deliveryCorrectionRetries,
                             maxAttempts: DELIVERY_CORRECTION_RETRIES,
-                        });
+                        };
+                        const previousReport = previousTurnReport();
+                        nextCorrection = {
+                            full: (brief) => (0, delivery_cjs_1.renderDeliveryCorrectionPrompt)({ ...correction, originalPrompt: brief, previousReport }),
+                            // The resumed conversation already holds the previous report.
+                            resumed: (0, delivery_cjs_1.renderResumedDeliveryCorrectionPrompt)({ ...correction, task: resumedTask }),
+                        };
                         continue;
                     }
                     await checkpointForRecovery(result, "incomplete delivery");
@@ -831,15 +905,19 @@ async function runClaimedSession(deps, claimed, sessionId, lifecycle) {
                 if (remediable && completionRemediationRetries < COMPLETION_REMEDIATION_RETRIES) {
                     completionRemediationRetries += 1;
                     log.warn(`completion for ${leaseId} needs more work (${rejectionDetail}); restarting agent turn ${completionRemediationRetries}/${COMPLETION_REMEDIATION_RETRIES} in the same worktree.`);
-                    // A new turn is a fresh agent invocation: the rejection alone would
-                    // reach an agent that has never seen the task.
-                    nextPrompt = (0, prompt_cjs_1.renderCompletionRemediationPrompt)({
-                        originalPrompt: briefPrompt,
+                    // A fresh agent invocation needs the brief: the rejection alone would
+                    // reach an agent that has never seen the task (#1978). A resumed
+                    // conversation already holds the brief and the previous report.
+                    const correction = {
                         rejection: redactedRejection,
-                        previousReport: previousTurnReport(),
                         attempt: completionRemediationRetries,
                         maxAttempts: COMPLETION_REMEDIATION_RETRIES,
-                    });
+                    };
+                    const previousReport = previousTurnReport();
+                    nextCorrection = {
+                        full: (brief) => (0, prompt_cjs_1.renderCompletionRemediationPrompt)({ ...correction, originalPrompt: brief, previousReport }),
+                        resumed: (0, prompt_cjs_1.renderResumedCompletionRemediationPrompt)({ ...correction, task: resumedTask }),
+                    };
                     continue;
                 }
                 if (remediable) {

package/node_modules/jsonc-parser/CHANGELOG.md

@@ -0,0 +1,76 @@
+3.3.0 2022-06-24
+=================
+- `JSONVisitor.onObjectBegin` and `JSONVisitor.onArrayBegin` can now return `false` to instruct the visitor that no children should be visited.
+
+
+3.2.0 2022-08-30
+=================
+- update the version of the bundled Javascript files to `es2020`.
+- include all `const enum` values in the bundled JavaScript files (`ScanError`, `SyntaxKind`, `ParseErrorCode`).
+
+3.1.0 2022-07-07
+==================
+  * added new API `FormattingOptions.keepLines` : It leaves the initial line positions in the formatting.
+
+3.0.0 2020-11-13
+==================
+  * fixed API spec for `parseTree`. Can return `undefine` for empty input.
+  * added new API `FormattingOptions.insertFinalNewline`.
+
+
+2.3.0 2020-07-03
+==================
+  * new API `ModificationOptions.isArrayInsertion`: If `JSONPath` refers to an index of an array and `isArrayInsertion` is `true`, then `modify` will insert a new item at that location instead of overwriting its contents.
+  * `ModificationOptions.formattingOptions` is now optional. If not set, newly inserted content will not be formatted.
+
+
+2.2.0 2019-10-25
+==================
+  * added `ParseOptions.allowEmptyContent`. Default is `false`.
+  * new API `getNodeType`: Returns the type of a value returned by parse.
+  * `parse`: Fix issue with empty property name
+
+2.1.0 2019-03-29
+==================
+ * `JSONScanner` and `JSONVisitor` return lineNumber / character.
+
+2.0.0 2018-04-12
+==================
+  * renamed `Node.columnOffset` to `Node.colonOffset`
+  * new API `getNodePath`: Gets the JSON path of the given JSON DOM node
+  * new API `findNodeAtOffset`: Finds the most inner node at the given offset. If `includeRightBound` is set, also finds nodes that end at the given offset.
+
+1.0.3 2018-03-07
+==================
+  * provide ems modules
+
+1.0.2 2018-03-05
+==================
+  * added the `visit.onComment` API, reported when comments are allowed.
+  * added the `ParseErrorCode.InvalidCommentToken` enum value, reported when comments are disallowed.
+
+1.0.1
+==================
+  * added the `format` API: computes edits to format a JSON document.
+  * added the `modify` API: computes edits to insert, remove or replace a property or value in a JSON document.
+  * added the `allyEdits` API: applies edits to a document
+
+1.0.0
+==================
+ * remove nls dependency (remove `getParseErrorMessage`)
+
+0.4.2 / 2017-05-05
+==================
+ * added `ParseError.offset` & `ParseError.length`
+
+0.4.1 / 2017-04-02
+==================
+ * added `ParseOptions.allowTrailingComma`
+
+0.4.0 / 2017-02-23
+==================
+  * fix for `getLocation`. Now `getLocation` inside an object will always return a property from inside that property. Can be empty string if the object has no properties or if the offset is before a actual property  `{ "a": { | }} will return location ['a', ' ']`
+
+0.3.0 / 2017-01-17
+==================
+  * Updating to typescript 2.0

package/node_modules/jsonc-parser/LICENSE.md

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) Microsoft
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.