@nathapp/nax 0.64.2-canary.1 → 0.64.2-canary.2

package/dist/nax.js

@@ -5304,7 +5304,11 @@ class AgentManager {
     const sessionRole = handle.role ?? opts.sessionRole ?? "main";
     const start = Date.now();
     try {
-      const result = await this._sendPrompt(handle, prompt, opts);
+      const rawResult = await this._sendPrompt(handle, prompt, opts);
+      const result = {
+        ...rawResult,
+        protocolIds: rawResult.protocolIds ?? handle.protocolIds
+      };
       const event = {
         kind: "session-turn",
         sessionName: handle.id,
@@ -30355,7 +30359,9 @@ function turnResultToAgentResult(r) {
     durationMs: 0,
     estimatedCostUsd: r.estimatedCostUsd ?? 0,
     exactCostUsd: r.exactCostUsd,
-    tokenUsage: r.tokenUsage
+    tokenUsage: r.tokenUsage,
+    protocolIds: r.protocolIds,
+    internalRoundTrips: r.internalRoundTrips
   };
 }
 function buildHopCallback(ctx, sessionId, _initialOptions) {
@@ -36840,9 +36846,9 @@ async function runTrackedSession(state, id, runner, request) {
     ...request,
     runOptions: {
       ...request.runOptions,
-      onSessionEstablished: (protocolIds, sessionName2) => {
+      onSessionEstablished: (protocolIds2, sessionName2) => {
         try {
-          state.bindHandle(id, sessionName2, protocolIds);
+          state.bindHandle(id, sessionName2, protocolIds2);
         } catch (err) {
           getLogger().warn("session", "bindHandle via onSessionEstablished failed", {
             storyId: state.sessions.get(id)?.storyId,
@@ -36850,7 +36856,7 @@ async function runTrackedSession(state, id, runner, request) {
             error: err instanceof Error ? err.message : String(err)
           });
         }
-        callerCallback?.(protocolIds, sessionName2);
+        callerCallback?.(protocolIds2, sessionName2);
       }
     }
   };
@@ -36925,6 +36931,8 @@ async function runTrackedSession(state, id, runner, request) {
   if (current?.state === "RUNNING") {
     state.transition(id, result.success ? "COMPLETED" : "FAILED");
   }
+  const protocolIds = result.protocolIds ?? current?.protocolIds;
+  const turn = Math.max(result.internalRoundTrips ?? 1, 1);
   const sessionName = state.nameFor({
     workdir: pre.workdir,
     featureName: pre.featureName,
@@ -36943,10 +36951,10 @@ async function runTrackedSession(state, id, runner, request) {
     featureName: pre.featureName,
     workdir: pre.workdir,
     resolvedPermissions,
-    turn: result.internalRoundTrips ?? 0,
+    turn,
     protocolIds: {
-      sessionId: result.protocolIds?.sessionId ?? null,
-      recordId: result.protocolIds?.recordId ?? null
+      sessionId: protocolIds?.sessionId ?? null,
+      recordId: protocolIds?.recordId ?? null
     },
     origin: "runTrackedSession",
     tokenUsage: result.tokenUsage,
@@ -37336,11 +37344,12 @@ class SessionManager {
     }
     this._busySessions.add(handle.id);
     try {
-      return await adapter.sendTurn(handle, prompt, {
+      const result = await adapter.sendTurn(handle, prompt, {
         interactionHandler: opts?.interactionHandler ?? NO_OP_INTERACTION_HANDLER,
         signal: opts?.signal,
         maxTurns: opts?.maxTurns
       });
+      return { ...result, protocolIds: result.protocolIds ?? handle.protocolIds };
     } catch (err) {
       if (opts?.signal?.aborted || err instanceof Error && err.name === "AbortError") {
         this._cancelledSessions.add(handle.id);
@@ -37648,7 +37657,9 @@ function createSessionRunHop(sessionManager) {
           durationMs: Date.now() - startMs,
           estimatedCostUsd: turnResult.estimatedCostUsd ?? 0,
           exactCostUsd: turnResult.exactCostUsd,
-          tokenUsage: turnResult.tokenUsage
+          tokenUsage: turnResult.tokenUsage,
+          protocolIds: handle.protocolIds,
+          internalRoundTrips: turnResult.internalRoundTrips
         }
       };
     } catch (err) {
@@ -46763,7 +46774,8 @@ async function runThreeSessionTdd(options) {
     lite = false,
     _recursionDepth = 0,
     projectDir,
-    agentManager
+    agentManager,
+    runtime
   } = options;
   const logger = getLogger();
   const MAX_RECURSION_DEPTH = 2;
@@ -46906,7 +46918,7 @@ async function runThreeSessionTdd(options) {
     };
   }
   const implementerBinding = getTddSessionBinding?.("implementer");
-  const { cost: fullSuiteGateCost, fullSuiteGatePassed } = await runFullSuiteGate(story, config2, workdir, agentManager, implementerTier, lite, logger, featureName, projectDir, implementerBinding?.sessionManager, implementerBinding?.sessionId);
+  const { cost: fullSuiteGateCost, fullSuiteGatePassed } = await runFullSuiteGate(story, config2, workdir, agentManager, implementerTier, lite, logger, featureName, projectDir, implementerBinding?.sessionManager, implementerBinding?.sessionId, runtime);
   const session3Ref = await captureGitRef(workdir) ?? "HEAD";
   const verifierBundle = await getTddContextBundle?.("verifier") ?? tddContextBundles?.verifier;
   const session3 = await runTddSessionOp(verifyTddOp, options, session3Ref, verifierBundle, getTddSessionBinding?.("verifier"));
@@ -47162,7 +47174,8 @@ async function runThreeSessionTddFromCtx(ctx, opts) {
     interactionChain: ctx.interaction,
     projectDir: ctx.projectDir,
     abortSignal: ctx.abortSignal,
-    agentManager: ctx.agentManager
+    agentManager: ctx.agentManager,
+    runtime: ctx.runtime
   });
 }
 var init_orchestrator_ctx = __esm(() => {
@@ -50141,7 +50154,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.64.2-canary.1",
+    version: "0.64.2-canary.2",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -50225,8 +50238,8 @@ var init_version = __esm(() => {
   NAX_VERSION = package_default.version;
   NAX_COMMIT = (() => {
     try {
-      if (/^[0-9a-f]{6,10}$/.test("b8feb3bf"))
-        return "b8feb3bf";
+      if (/^[0-9a-f]{6,10}$/.test("6c7fd18c"))
+        return "6c7fd18c";
     } catch {}
     try {
       const result = Bun.spawnSync(["git", "rev-parse", "--short", "HEAD"], {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nathapp/nax",
-  "version": "0.64.2-canary.1",
+  "version": "0.64.2-canary.2",
   "description": "AI Coding Agent Orchestrator — loops until done",
   "type": "module",
   "bin": {