norn-cli 4.2.0 → 4.3.1

package/README.md

@@ -74,6 +74,12 @@ npm install -g norn-cli
 norn ./tests/smoke.norn -e dev
 ```
 
+Update an existing global installation from npm with:
+
+```bash
+norn update
+```
+
 For a hosted agent workflow, select one sequence and supply its runtime inputs explicitly:
 
 ```bash

package/dist/cli.js

@@ -101266,7 +101266,7 @@ var require_cross_spawn = __commonJS({
     var cp2 = require("child_process");
     var parse6 = require_parse2();
     var enoent = require_enoent();
-    function spawn7(command, args, options) {
+    function spawn8(command, args, options) {
       const parsed = parse6(command, args, options);
       const spawned = cp2.spawn(parsed.command, parsed.args, parsed.options);
       enoent.hookChildProcess(spawned, parsed);
@@ -101278,8 +101278,8 @@ var require_cross_spawn = __commonJS({
       result.error = result.error || enoent.verifyENOENTSync(result.status, parsed);
       return result;
     }
-    module2.exports = spawn7;
-    module2.exports.spawn = spawn7;
+    module2.exports = spawn8;
+    module2.exports.spawn = spawn8;
     module2.exports.sync = spawnSync3;
     module2.exports._parse = parse6;
     module2.exports._enoent = enoent;
@@ -186020,6 +186020,25 @@ function mcpToolAllowsAdditionalProperties(source) {
   return schema.additionalProperties !== false;
 }
 
+// src/agents/agentActivity.ts
+function describeAgentActivity(event) {
+  if (event.state === "completed") {
+    return `Completed agent ${event.agent}`;
+  }
+  switch (event.kind) {
+    case "preparing":
+      return `${event.agent} \xB7 Preparing tools and context`;
+    case "model":
+      return `${event.agent} \xB7 Waiting for model response`;
+    case "mcp":
+      return `${event.agent} \xB7 Calling MCP tool ${event.name ?? "tool"}`;
+    case "knowledge":
+      return `${event.agent} \xB7 Loading knowledge`;
+    case "agent":
+      return `${event.agent} \xB7 Invoking agent ${event.name ?? "agent"}`;
+  }
+}
+
 // src/agents/judgeExpectations.ts
 var fs14 = __toESM(require("fs"));
 var path15 = __toESM(require("path"));
@@ -199525,6 +199544,18 @@ var AgentInvocationRunner = class {
   nextInvocationId() {
     return `agent-${(0, import_crypto7.randomUUID)()}`;
   }
+  emitActivity(hop, state, kind, name) {
+    this.options.onInvocationActivity?.({
+      state,
+      invocationId: hop.invocationId,
+      ...hop.parentInvocationId ? { parentInvocationId: hop.parentInvocationId } : {},
+      ...hop.hopPath ? { hopPath: hop.hopPath } : {},
+      agent: hop.agent,
+      depth: hop.depth,
+      kind,
+      ...name ? { name } : {}
+    });
+  }
   validateContract(agent, kind, value) {
     const builtIn = agent.builtInContracts?.[kind];
     if (builtIn) {
@@ -199665,6 +199696,11 @@ var AgentInvocationRunner = class {
         };
         parentHop.output.toolCalls.push(record2);
         const startedAt = Date.now();
+        const activityKind = definition.kind === "agent" ? "agent" : definition.kind === "knowledge" ? "knowledge" : "mcp";
+        const reportsActivity = definition.kind !== "context";
+        if (reportsActivity) {
+          this.emitActivity(parentHop, "active", activityKind, definition.name);
+        }
         try {
           const output2 = await execute(input2, context);
           record2.output = cloneSnapshotValue(output2, null);
@@ -199677,6 +199713,9 @@ var AgentInvocationRunner = class {
           if (context.childInvocationId) {
             record2.childInvocationId = context.childInvocationId;
           }
+          if (reportsActivity) {
+            this.emitActivity(parentHop, "active", "model");
+          }
         }
       }
     };
@@ -199739,6 +199778,7 @@ var AgentInvocationRunner = class {
       depth,
       cycle: hop.cycle
     });
+    this.emitActivity(hop, "active", "preparing");
     let resolvedModel;
     let fatalToolError;
     let preparedKnowledge;
@@ -199866,6 +199906,7 @@ var AgentInvocationRunner = class {
       let providerResponse;
       let correctionConversation = conversation;
       for (; ; ) {
+        this.emitActivity(hop, "active", "model");
         providerResponse = await adapter2.run({
           ...providerRequest,
           conversation: correctionConversation
@@ -199964,11 +200005,15 @@ var AgentInvocationRunner = class {
       }
     } finally {
       await this.options.mcpSessionManager?.closeScope(invocationId);
+      if (this.options.signal?.aborted) {
+        this.emitActivity(hop, "completed", "model");
+      }
     }
     hop.output.model = hop.output.model || resolvedModel?.displayName || "";
     hop.output.ms = hop.output.ms || Date.now() - startedAt;
     this.options.knowledgeCoordinator?.recordInvocation(agent, hop, preparedKnowledge);
     this.options.onInvocationProgress?.({ phase: "completed", hop });
+    this.emitActivity(hop, "completed", "model");
     return hop;
   }
   /**
@@ -206997,6 +207042,16 @@ async function runSequenceWithJar(sequenceContent, fileVariables, cookieJar, wor
                   nestingDepth,
                   agentEvent
                 });
+              },
+              onInvocationActivity: (agentActivity) => {
+                onProgress?.({
+                  currentStep: stepIdx + 1,
+                  totalSteps,
+                  stepType: "judge",
+                  stepDescription: describeAgentActivity(agentActivity),
+                  nestingDepth,
+                  agentActivity
+                });
               }
             });
             const run = await runner.run(
@@ -207135,6 +207190,16 @@ ${describeUnmetExpectations(verdict).map((line2) => `  - ${line2}`).join("\n")}`
                   nestingDepth,
                   agentEvent
                 });
+              },
+              onInvocationActivity: (agentActivity) => {
+                onProgress?.({
+                  currentStep: stepIdx + 1,
+                  totalSteps,
+                  stepType: "agent",
+                  stepDescription: describeAgentActivity(agentActivity),
+                  nestingDepth,
+                  agentActivity
+                });
               }
             });
             const run = await runner.run(agent, input2);
@@ -213122,6 +213187,170 @@ function installCliRunCancellation(onCancellationRequested, forceExit = (code) =
   };
 }
 
+// src/cli/agentActivityProgress.ts
+var liveDisplays = /* @__PURE__ */ new Set();
+function clearAllAgentActivityProgressDisplays() {
+  for (const display of [...liveDisplays]) {
+    display.clear();
+  }
+}
+var FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
+function formatElapsed(ms) {
+  const seconds = Math.max(0, Math.floor(ms / 1e3));
+  if (seconds < 60) {
+    return `${seconds}s`;
+  }
+  return `${Math.floor(seconds / 60)}m ${seconds % 60}s`;
+}
+function fitLine(value, columns) {
+  const terminalColumns = columns && columns >= 40 ? columns : 100;
+  const width = Math.max(24, terminalColumns - 1);
+  return value.length <= width ? value : `${value.slice(0, Math.max(1, width - 1))}\u2026`;
+}
+function createAgentActivityProgressDisplay(stream4 = process.stderr, now = Date.now) {
+  const enabled = stream4.isTTY === true;
+  const active = /* @__PURE__ */ new Map();
+  let order = 0;
+  let frame = 0;
+  let lineVisible = false;
+  let timer;
+  let display;
+  const current = () => [...active.values()].sort((left, right) => right.event.depth - left.event.depth || right.order - left.order)[0];
+  const render = () => {
+    if (!enabled) {
+      return;
+    }
+    const item = current();
+    if (!item) {
+      if (lineVisible) {
+        stream4.write("\r\x1B[2K");
+        lineVisible = false;
+      }
+      return;
+    }
+    const elapsed = formatElapsed(now() - item.startedAt);
+    const line2 = fitLine(`${FRAMES[frame++ % FRAMES.length]} ${item.description}  ${elapsed}`, stream4.columns);
+    stream4.write(`\r\x1B[2K${line2}`);
+    lineVisible = true;
+  };
+  const ensureTimer = () => {
+    if (!enabled || timer) {
+      return;
+    }
+    timer = setInterval(render, 120);
+    timer.unref?.();
+  };
+  const stopTimer = () => {
+    if (!timer) {
+      return;
+    }
+    clearInterval(timer);
+    timer = void 0;
+  };
+  const clear = () => {
+    active.clear();
+    stopTimer();
+    render();
+    liveDisplays.delete(display);
+  };
+  display = {
+    update: (event, description) => {
+      if (!enabled) {
+        return;
+      }
+      if (event.state === "completed") {
+        active.delete(event.invocationId);
+      } else {
+        active.set(event.invocationId, {
+          event,
+          description,
+          startedAt: now(),
+          order: order++
+        });
+      }
+      if (active.size > 0) {
+        liveDisplays.add(display);
+        ensureTimer();
+      } else {
+        stopTimer();
+        liveDisplays.delete(display);
+      }
+      render();
+    },
+    clear,
+    dispose: clear
+  };
+  return display;
+}
+
+// src/cli/update.ts
+var import_child_process5 = require("child_process");
+var NORN_NPM_PACKAGE = "norn-cli@latest";
+function resolveUpdateInvocation(platform2 = process.platform, commandShell = process.env.ComSpec) {
+  if (platform2 === "win32") {
+    return {
+      command: commandShell || "cmd.exe",
+      args: ["/d", "/s", "/c", `npm install --global ${NORN_NPM_PACKAGE}`]
+    };
+  }
+  return {
+    command: "npm",
+    args: ["install", "--global", NORN_NPM_PACKAGE]
+  };
+}
+function printUpdateHelp() {
+  console.log(`
+Usage: norn update
+
+Updates the globally installed Norn CLI to the latest npm release.
+Equivalent to: npm install --global ${NORN_NPM_PACKAGE}
+`);
+}
+async function handleUpdateCommand(args, spawnProcess = import_child_process5.spawn) {
+  if (args.length === 1 && (args[0] === "--help" || args[0] === "-h")) {
+    printUpdateHelp();
+    return 0;
+  }
+  if (args.length > 0) {
+    console.error(`Error: norn update does not accept arguments: ${args.join(" ")}`);
+    console.error("Run norn update --help for usage.");
+    return 1;
+  }
+  console.log("Updating Norn CLI to the latest version...");
+  const invocation = resolveUpdateInvocation();
+  return new Promise((resolve29) => {
+    let settled = false;
+    const finish = (exitCode) => {
+      if (!settled) {
+        settled = true;
+        resolve29(exitCode);
+      }
+    };
+    const child = spawnProcess(invocation.command, invocation.args, {
+      stdio: "inherit",
+      windowsHide: true
+    });
+    child.once("error", (error2) => {
+      console.error(`Unable to start npm: ${error2.message}`);
+      console.error(`Run npm install --global ${NORN_NPM_PACKAGE} manually.`);
+      finish(1);
+    });
+    child.once("close", (code, signal) => {
+      if (settled) {
+        return;
+      }
+      if (code === 0) {
+        console.log("Norn CLI update complete. Run norn --version to verify the installed version.");
+        finish(0);
+        return;
+      }
+      const detail = signal ? `signal ${signal}` : `exit code ${code ?? "unknown"}`;
+      console.error(`Norn CLI update failed (${detail}).`);
+      finish(1);
+    });
+  });
+}
+
 // src/cli.ts
 function handleImportResolutionErrors(errors, colors) {
   const { blockingErrors, warningErrors } = splitImportResolutionErrors(errors);
@@ -213270,10 +213499,19 @@ function redactSequenceResultForJson(result, redaction) {
 }
 function createAgentProgressCallback(sequenceName, colors, redaction, verbose) {
   let printedHeading = false;
+  const activityDisplay = createAgentActivityProgressDisplay();
   return (info) => {
+    if (info.agentActivity) {
+      activityDisplay.update(
+        info.agentActivity,
+        redactString(describeAgentActivity(info.agentActivity), redaction)
+      );
+      return;
+    }
     if (info.stepType !== "agent" || !info.stepResult?.agent) {
       return;
     }
+    activityDisplay.clear();
     if (!printedHeading) {
       console.log("");
       console.log(colors.bold(`Agent trace: ${sequenceName}`));
@@ -213627,6 +213865,7 @@ function printHelp() {
 Norn CLI - Run HTTP requests and test sequences
 
 Usage: norn <file.norn|directory> [options]
+       norn update
        norn replay <recording.json> [--json] [--from <agent-or-hop>] [--env <name>]
        norn secrets <command> [options]
        norn contracts <sync|check> <file.nornapi> [options]
@@ -213666,6 +213905,9 @@ Options:
   -V, --version          Show the installed Norn CLI version
   -h, --help             Show this help message
 
+Maintenance:
+  norn update            Update the global Norn CLI to the latest npm release
+
 Report Generation:
   Use --output-dir for auto-generated timestamped filenames:
     norn tests.norn --output-dir ./reports
@@ -214032,6 +214274,10 @@ async function runAllSequences(fileContent, variables, cookieJar, workingDir, ap
 }
 async function main() {
   const rawArgs = process.argv.slice(2);
+  if (rawArgs[0] === "update") {
+    const exitCode = await handleUpdateCommand(rawArgs.slice(1));
+    process.exit(exitCode);
+  }
   if (rawArgs[0] === "replay") {
     const exitCode = await handleReplayCommand(rawArgs.slice(1));
     process.exit(exitCode);
@@ -214050,7 +214296,7 @@ async function main() {
   }
   const args = rawArgs[0] === "run" ? rawArgs.slice(1) : rawArgs;
   if (args.length === 1 && (args[0] === "--version" || args[0] === "-V")) {
-    console.log(`Norn CLI ${"4.2.0"}`);
+    console.log(`Norn CLI ${"4.3.0"}`);
     return;
   }
   if (args.length === 0) {
@@ -214174,6 +214420,7 @@ async function main() {
   }
   if (!options.request) {
     activeRunCancellation = installCliRunCancellation((signal) => {
+      clearAllAgentActivityProgressDisplays();
       console.error(colors.warning(`Cancellation requested by ${signal}; stopping the current run...`));
     });
   }
@@ -214625,6 +214872,7 @@ ${colors.error("Errors:")}`);
   activeRunCancellation = void 0;
 }
 main().catch((error2) => {
+  clearAllAgentActivityProgressDisplays();
   if (isSequenceCancelledError(error2) && activeRunCancellation?.getReceivedSignal()) {
     const exitCode = activeRunCancellation.getExitCode();
     activeRunCancellation.dispose();

package/package.json

@@ -2,7 +2,7 @@
   "name": "norn-cli",
   "displayName": "Norn",
   "description": "Version-controlled API and database tests. Author in VS Code, then run the same files from the CLI and CI.",
-  "version": "4.2.0",
+  "version": "4.3.1",
   "publisher": "Norn-PeterKrustanov",
   "author": {
     "name": "Peter Krastanov"
@@ -61,6 +61,7 @@
     "onCommand:norn.debugSequence",
     "onCommand:norn.debug.runToNextContractFailure",
     "onCommand:norn.showAgentGraph",
+    "onCommand:norn.showAgentRunResults",
     "onDebugResolve:norn"
   ],
   "main": "./dist/extension.js",
@@ -92,6 +93,11 @@
         "title": "Show Agent Graph",
         "category": "Norn"
       },
+      {
+        "command": "norn.showAgentRunResults",
+        "title": "Show Agent Run Results",
+        "category": "Norn"
+      },
       {
         "command": "norn.knowledge.toggleMarkup",
         "title": "Knowledge: Toggle Markup",
@@ -625,7 +631,7 @@
     "test:regression": "node ./tests/test-scripts/run-regression.js",
     "test:prerelease": "npm test && npm run test:regression",
     "publish:npm": "node -e \"const fs=require('fs');const p=require('./package.json');p.name='norn-cli';fs.writeFileSync('package.json',JSON.stringify(p,null,2)+'\\n')\" && npm publish; exit_code=$?; node -e \"const fs=require('fs');const p=require('./package.json');p.name='norn';fs.writeFileSync('package.json',JSON.stringify(p,null,2)+'\\n')\"; exit $exit_code",
-    "publish:vsce": "node -e \"const p=require('./package.json');p.name='norn';require('fs').writeFileSync('package.json',JSON.stringify(p,null,2))\" && npx vsce publish",
+    "publish:vsce": "vsce publish",
     "publish:all": "npm run publish:npm && npm run publish:vsce"
   },
   "devDependencies": {
@@ -637,6 +643,7 @@
     "@types/vscode": "^1.125.0",
     "@vscode/test-cli": "^0.0.15",
     "@vscode/test-electron": "^3.1.0",
+    "@vscode/vsce": "^3.9.2",
     "@xterm/addon-fit": "^0.11.0",
     "@xterm/xterm": "^6.0.0",
     "esbuild": "^0.27.2",
@@ -654,7 +661,6 @@
     "axios": "^1.13.2",
     "chalk": "^5.4.1",
     "mssql": "^12.2.0",
-    "norn-cli": "^1.10.6",
     "openai": "^6.49.0",
     "pg": "^8.20.0",
     "tough-cookie": "^6.0.0"