norn-cli 4.6.0 → 4.6.2

package/dist/cli.js

@@ -166647,6 +166647,9 @@ function parseDurationToMs(rawValue, defaultUnit = "ms") {
 }
 
 // src/formUrlEncoded.ts
+function decodeFieldValue(value) {
+  return isQuotedStringLiteral(value) ? decodeQuotedStringLiteral(value) : value;
+}
 function parseEqualsField(segment) {
   const eqIndex = segment.indexOf("=");
   if (eqIndex <= 0) {
@@ -166654,9 +166657,53 @@ function parseEqualsField(segment) {
   }
   return {
     key: segment.substring(0, eqIndex).trim(),
-    value: segment.substring(eqIndex + 1).trim()
+    value: decodeFieldValue(segment.substring(eqIndex + 1).trim())
   };
 }
+function splitAmpersandDelimitedLine(line2) {
+  const segments = [];
+  let current = "";
+  let quote;
+  let escaped = false;
+  let inValue = false;
+  let valueStarted = false;
+  for (const char of line2) {
+    if (escaped) {
+      current += char;
+      escaped = false;
+      continue;
+    }
+    if (quote && char === "\\") {
+      current += char;
+      escaped = true;
+      continue;
+    }
+    if ((char === '"' || char === "'") && (quote || inValue && !valueStarted)) {
+      if (!quote) {
+        quote = char;
+      } else if (quote === char) {
+        quote = void 0;
+      }
+      current += char;
+      continue;
+    }
+    if (char === "&" && !quote) {
+      segments.push(current.trim());
+      current = "";
+      inValue = false;
+      valueStarted = false;
+      continue;
+    }
+    current += char;
+    if (!inValue && char === "=") {
+      inValue = true;
+    } else if (inValue && !/\s/.test(char)) {
+      valueStarted = true;
+    }
+  }
+  segments.push(current.trim());
+  return segments;
+}
 function isFormUrlEncodedContentType(contentType) {
   return Boolean(contentType && contentType.toLowerCase().includes("application/x-www-form-urlencoded"));
 }
@@ -166672,7 +166719,7 @@ function parseFormUrlEncodedLines(lines) {
     const firstColonIndex = line2.indexOf(":");
     if (firstEqIndex > 0 && (firstColonIndex === -1 || firstEqIndex < firstColonIndex)) {
       if (line2.includes("&")) {
-        const segments = line2.split("&").map((segment) => segment.trim());
+        const segments = splitAmpersandDelimitedLine(line2);
         const hasInvalidSegment = segments.some((segment) => !parseEqualsField(segment));
         if (hasInvalidSegment) {
           errors.push({
@@ -166699,7 +166746,7 @@ function parseFormUrlEncodedLines(lines) {
     if (firstColonIndex > 0) {
       fields.push({
         key: line2.substring(0, firstColonIndex).trim(),
-        value: line2.substring(firstColonIndex + 1).trim()
+        value: decodeFieldValue(line2.substring(firstColonIndex + 1).trim())
       });
       continue;
     }
@@ -166723,10 +166770,13 @@ function encodeFormUrlEncodedBody(body) {
     return { encodedBody: "", errors };
   }
   return {
-    encodedBody: fields.map((field) => `${encodeURIComponent(field.key)}=${encodeURIComponent(field.value)}`).join("&"),
+    encodedBody: encodeFormUrlEncodedFields(fields),
     errors: []
   };
 }
+function encodeFormUrlEncodedFields(fields) {
+  return fields.map((field) => `${encodeURIComponent(field.key)}=${encodeURIComponent(field.value)}`).join("&");
+}
 
 // src/sequenceCancellation.ts
 var SEQUENCE_CANCELLED_MESSAGE = "Sequence run cancelled by user.";
@@ -166861,7 +166911,10 @@ async function sendRequestWithJar(request, jar, retryOptions, signal) {
           );
           const contentTypeValue = contentType ? headers[contentType] : "";
           if (isFormUrlEncodedContentType(contentTypeValue)) {
-            const encoded = encodeFormUrlEncodedBody(currentBody);
+            const encoded = request.formUrlEncodedBody ? {
+              encodedBody: encodeFormUrlEncodedFields(request.formUrlEncodedBody.fields),
+              errors: request.formUrlEncodedBody.errors
+            } : encodeFormUrlEncodedBody(currentBody);
             if (encoded.errors.length > 0) {
               throw new NornError({
                 category: "syntax",
@@ -168154,7 +168207,7 @@ function validatePreparedRequest(parsed, context) {
   }
   const contentType = getHeaderValueCaseInsensitive(parsed.headers, "Content-Type");
   if (isFormUrlEncodedContentType(contentType)) {
-    const { errors } = parseFormUrlEncodedBody(parsed.body);
+    const errors = parsed.formUrlEncodedBody?.errors ?? parseFormUrlEncodedBody(parsed.body).errors;
     if (errors.length > 0) {
       throw new NornError({
         category: "syntax",
@@ -185378,6 +185431,25 @@ var McpSessionManager = class {
 };
 
 // src/requestPreparation.ts
+function getHeaderValueCaseInsensitive2(headers, name) {
+  const target = name.toLowerCase();
+  return Object.entries(headers).find(([headerName]) => headerName.toLowerCase() === target)?.[1];
+}
+function attachPreparedFormBody(request, authoredBody, variables) {
+  const contentType = getHeaderValueCaseInsensitive2(request.headers, "Content-Type");
+  if (!isFormUrlEncodedContentType(contentType) || !authoredBody) {
+    return request;
+  }
+  const parsed = parseFormUrlEncodedBody(authoredBody);
+  const prepared = {
+    errors: parsed.errors,
+    fields: parsed.fields.map((field) => ({
+      key: substituteVariables(field.key, variables),
+      value: substituteVariables(field.value, variables)
+    }))
+  };
+  return { ...request, formUrlEncodedBody: prepared };
+}
 function escapeRegExp(value) {
   return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
@@ -185421,7 +185493,8 @@ function resolveBareVariableRequestBody(request, variables) {
   }
   return {
     ...request,
-    body: stringifyRequestValue(variables[bareVariableMatch[1]])
+    body: stringifyRequestValue(variables[bareVariableMatch[1]]),
+    formUrlEncodedBody: void 0
   };
 }
 function applyHeaderGroupsToRequest(parsed, requestText, headerGroups, variables) {
@@ -185530,12 +185603,13 @@ function prepareRequestFromContent(requestContent, variables, apiDefinitions) {
       for (const [headerName, headerValue] of Object.entries(apiRequest.inlineHeaders)) {
         combinedHeaders[headerName] = substituteVariables(headerValue, variables);
       }
-      const request2 = {
+      let request2 = {
         method: apiRequest.method,
         url: resolvedPath,
         headers: combinedHeaders,
         body: apiRequest.body ? substituteVariables(apiRequest.body, variables) : void 0
       };
+      request2 = attachPreparedFormBody(request2, apiRequest.body, variables);
       return {
         request: request2,
         description: `${apiRequest.endpointName}(${Object.values(resolvedParams).join(", ")}) -> ${request2.method} ${request2.url}`,
@@ -185544,9 +185618,12 @@ function prepareRequestFromContent(requestContent, variables, apiDefinitions) {
     }
   }
   let request = parserHttpRequest(requestContent, variables);
+  let authoredRequest = parserHttpRequest(requestContent, {});
   if (apiDefinitions && apiDefinitions.headerGroups.length > 0) {
     request = applyHeaderGroupsToRequest(request, requestContent, apiDefinitions.headerGroups, variables);
+    authoredRequest = applyHeaderGroupsToRequest(authoredRequest, requestContent, apiDefinitions.headerGroups, {});
   }
+  request = attachPreparedFormBody(request, authoredRequest.body, variables);
   return {
     request,
     description: `${request.method} ${request.url}`
@@ -199700,6 +199777,9 @@ var AgentInvocationRunner = class {
   inputTokenBudget;
   invocationCount = 0;
   toolResultStore = new AgentToolResultStore();
+  rootInvocationId;
+  journalEntryCount = 0;
+  journalKeys = /* @__PURE__ */ new Map();
   async run(agent, input2) {
     throwIfSequenceCancelled(this.options.signal);
     const rootInvocationIndex2 = this.options.rootInvocationIndex ?? 1;
@@ -199725,6 +199805,7 @@ var AgentInvocationRunner = class {
     this.options.onInvocationActivity?.({
       state,
       invocationId: hop.invocationId,
+      ...this.rootInvocationId ? { rootInvocationId: this.rootInvocationId } : {},
       ...hop.parentInvocationId ? { parentInvocationId: hop.parentInvocationId } : {},
       ...hop.hopPath ? { hopPath: hop.hopPath } : {},
       agent: hop.agent,
@@ -199733,6 +199814,39 @@ var AgentInvocationRunner = class {
       ...name ? { name } : {}
     });
   }
+  reportJournalStatus(hop, input2) {
+    const kind = input2.kind;
+    const summary = typeof input2.summary === "string" ? input2.summary.trim() : "";
+    const next = typeof input2.next === "string" ? input2.next.trim() : void 0;
+    const kinds = ["new_work", "finding", "obstacle", "direction", "milestone"];
+    if (!kinds.includes(kind) || !summary || summary.length > 280 || next !== void 0 && next.length > 160) {
+      return { accepted: false, reason: "Use a listed kind, a 1\u2013280 character summary, and at most 160 characters for next." };
+    }
+    const keys = this.journalKeys.get(hop.invocationId) ?? /* @__PURE__ */ new Set();
+    this.journalKeys.set(hop.invocationId, keys);
+    const key = JSON.stringify([kind, summary, next ?? ""]);
+    if (keys.has(key)) {
+      return { accepted: true, reason: "Duplicate note omitted." };
+    }
+    if (keys.size >= 12 || this.journalEntryCount >= 48) {
+      return { accepted: false, reason: "Journal limit reached. Continue the task without further status reports." };
+    }
+    keys.add(key);
+    this.journalEntryCount++;
+    if (this.rootInvocationId && this.options.onJournalEvent && !this.options.signal?.aborted) {
+      this.options.onJournalEvent({
+        type: "note",
+        timestamp: Date.now(),
+        rootInvocationId: this.rootInvocationId,
+        invocationId: hop.invocationId,
+        agent: hop.agent,
+        kind,
+        summary,
+        ...next ? { next } : {}
+      });
+    }
+    return { accepted: true };
+  }
   validateContract(agent, kind, value) {
     const builtIn = agent.builtInContracts?.[kind];
     if (builtIn) {
@@ -199874,14 +199988,35 @@ var AgentInvocationRunner = class {
         };
         parentHop.output.toolCalls.push(record2);
         const startedAt = Date.now();
+        const journalCallId = definition.kind === "mcp" || definition.kind === "knowledge" ? this.nextInvocationId() : void 0;
+        let toolFailed = false;
+        if (journalCallId && this.rootInvocationId && this.options.onJournalEvent && !this.options.signal?.aborted) {
+          this.options.onJournalEvent({
+            type: "tool",
+            timestamp: startedAt,
+            rootInvocationId: this.rootInvocationId,
+            invocationId: parentHop.invocationId,
+            callId: journalCallId,
+            agent: parentHop.agent,
+            toolKind: definition.kind,
+            name: definition.name,
+            state: "started"
+          });
+        }
         const activityKind = definition.kind === "agent" ? "agent" : definition.kind === "knowledge" ? "knowledge" : "mcp";
-        const reportsActivity = definition.kind !== "context";
+        const reportsActivity = definition.kind !== "context" && definition.kind !== "journal";
         if (reportsActivity) {
           this.emitActivity(parentHop, "active", activityKind, definition.name);
         }
         try {
           const output2 = await execute(input2, context);
+          if (output2 && typeof output2 === "object" && "isError" in output2 && output2.isError === true) {
+            toolFailed = true;
+          }
           record2.output = cloneSnapshotValue(output2, null);
+          if (definition.kind === "journal") {
+            return output2;
+          }
           if (definition.kind === "context") {
             const text = agentInputToText(output2);
             return new PreparedAgentToolResult(output2, output2, text, JSON.stringify({
@@ -199899,10 +200034,25 @@ var AgentInvocationRunner = class {
             ownerId: parentHop.invocationId
           });
         } catch (error2) {
+          toolFailed = true;
           record2.output = getToolErrorOutput(error2);
           throw error2;
         } finally {
           record2.ms = context.recordedMs ?? Date.now() - startedAt;
+          if (journalCallId && this.rootInvocationId && this.options.onJournalEvent && !this.options.signal?.aborted) {
+            this.options.onJournalEvent({
+              type: "tool",
+              timestamp: Date.now(),
+              rootInvocationId: this.rootInvocationId,
+              invocationId: parentHop.invocationId,
+              callId: journalCallId,
+              agent: parentHop.agent,
+              toolKind: definition.kind,
+              name: definition.name,
+              state: "completed",
+              ...toolFailed ? { failed: true } : {}
+            });
+          }
           if (context.childInvocationId) {
             record2.childInvocationId = context.childInvocationId;
           }
@@ -199942,10 +200092,13 @@ var AgentInvocationRunner = class {
     this.options.onInvocationProgress?.({ phase: "completed", hop });
     return hop;
   }
-  async invokeAgent(agent, input2, depth, parentInvocationId, ancestors, conversation, hopPath) {
+  async invokeAgent(agent, input2, depth, parentInvocationId, ancestors, conversation, hopPath, parentAgentName) {
     throwIfSequenceCancelled(this.options.signal);
     const startedAt = Date.now();
     const invocationId = this.nextInvocationId();
+    if (depth === 0) {
+      this.rootInvocationId = invocationId;
+    }
     const hop = {
       invocationId,
       ...parentInvocationId ? { parentInvocationId } : {},
@@ -199971,6 +200124,18 @@ var AgentInvocationRunner = class {
       depth,
       cycle: hop.cycle
     });
+    if (parentInvocationId && parentAgentName && this.rootInvocationId && this.options.onJournalEvent && !this.options.signal?.aborted) {
+      this.options.onJournalEvent({
+        type: "handoff",
+        timestamp: Date.now(),
+        rootInvocationId: this.rootInvocationId,
+        invocationId,
+        parentInvocationId,
+        parentAgent: parentAgentName,
+        agent: agent.name,
+        input: input2
+      });
+    }
     this.emitActivity(hop, "active", "preparing");
     let resolvedModel;
     let fatalToolError;
@@ -200031,6 +200196,9 @@ var AgentInvocationRunner = class {
         invocationId
       );
       let systemPrompt = preparedKnowledge?.assembly.systemPrompt ?? authoredSystemPrompt;
+      if (this.options.onJournalEvent && !requestOverride) {
+        systemPrompt += "\n\nDevelopment work journal: call report_progress only when starting a distinct piece of work, finding something that changes the plan, encountering an obstacle, changing direction, or finishing a milestone. Keep each note short and factual about your own observed work. Do not report every tool call or use it as a heartbeat. Each report uses a model/tool turn and counts toward max_turns.";
+      }
       hop.accepts = this.validateContract(agent, "accepts", input2);
       if (hop.accepts && !hop.accepts.assertion.passed) {
         throw new Error(contractFailureMessage(hop.accepts));
@@ -200205,6 +200373,16 @@ ${TOOL_RESULT_RECOVERY_INSTRUCTIONS}`;
       if (reportedError instanceof AgentProviderRefusalError) {
         hop.output.text = reportedError.rawText;
       }
+      if (hop.error && this.rootInvocationId && this.options.onJournalEvent) {
+        this.options.onJournalEvent({
+          type: "runtime",
+          timestamp: Date.now(),
+          rootInvocationId: this.rootInvocationId,
+          invocationId,
+          agent: agent.name,
+          summary: `${agent.name} stopped: ${hop.error.slice(0, 280)}`
+        });
+      }
     } finally {
       await this.options.mcpSessionManager?.closeScope(invocationId);
       if (this.options.signal?.aborted) {
@@ -200255,9 +200433,13 @@ ${TOOL_RESULT_RECOVERY_INSTRUCTIONS}`;
       overrideKeys.add(key);
     }
     let callerLimitBreaches = 0;
-    if (agent.callableAgents.some((reference) => ["load_knowledge", "norn_read_tool_result", "norn_search_tool_results"].includes(reference.name.toLowerCase()))) {
+    const reservedAgentNames = ["load_knowledge", "norn_read_tool_result", "norn_search_tool_results"];
+    if (this.options.onJournalEvent || requestToolsOverride?.some((tool) => tool.kind === "journal")) {
+      reservedAgentNames.push("report_progress");
+    }
+    if (agent.callableAgents.some((reference) => reservedAgentNames.includes(reference.name.toLowerCase()))) {
       throw new Error(
-        "Agent names 'load_knowledge', 'norn_read_tool_result' and 'norn_search_tool_results' are reserved by Norn."
+        `Agent names ${reservedAgentNames.map((name) => `'${name}'`).join(", ")} are reserved by Norn.`
       );
     }
     if (knowledge?.hasLoadableKnowledge) {
@@ -200504,7 +200686,8 @@ ${TOOL_RESULT_RECOVERY_INSTRUCTIONS}`;
           parentHop.invocationId,
           ancestors,
           [...conversation],
-          childHopPath
+          childHopPath,
+          parentHop.agent
         );
         toolContext.childInvocationId = child.invocationId;
         for (const retry2 of pendingInputRetries) {
@@ -200560,11 +200743,44 @@ ${TOOL_RESULT_RECOVERY_INSTRUCTIONS}`;
           retry2.correctedByInvocationId = child.invocationId;
         }
         outputContractFailures = 0;
-        return Object.prototype.hasOwnProperty.call(child.output, "body") ? child.output.body : child.output.text;
+        const returnedOutput = Object.prototype.hasOwnProperty.call(child.output, "body") ? child.output.body : child.output.text;
+        if (this.rootInvocationId && this.options.onJournalEvent && !this.options.signal?.aborted) {
+          this.options.onJournalEvent({
+            type: "return",
+            timestamp: Date.now(),
+            rootInvocationId: this.rootInvocationId,
+            invocationId: child.invocationId,
+            parentInvocationId: parentHop.invocationId,
+            agent: child.agent,
+            parentAgent: parentHop.agent,
+            output: returnedOutput
+          });
+        }
+        return returnedOutput;
       }));
     }
+    const offeredJournal = requestToolsOverride?.find((tool) => tool.kind === "journal" && tool.name === "report_progress");
+    if (this.options.onJournalEvent || offeredJournal) {
+      providerTools.push(this.createRecordedProviderTool(parentHop, {
+        name: "report_progress",
+        providerName: offeredJournal?.providerName ?? "norn_report_progress",
+        kind: "journal",
+        description: offeredJournal?.description ?? "Record a short, meaningful development work-journal note. Use sparingly for a new piece of work, finding, obstacle, change of direction, or milestone. Do not report routine tool calls. This call uses one of your allowed model/tool turns.",
+        inputSchema: offeredJournal?.inputSchema ?? {
+          type: "object",
+          properties: {
+            kind: { type: "string", enum: ["new_work", "finding", "obstacle", "direction", "milestone"] },
+            summary: { type: "string", minLength: 1, maxLength: 280 },
+            next: { type: "string", maxLength: 160 }
+          },
+          required: ["kind", "summary"],
+          additionalProperties: false
+        }
+      }, async (input2) => this.reportJournalStatus(parentHop, input2)));
+    }
+    const hasRecoverableTools = providerTools.some((tool) => tool.kind !== "journal");
     const offeredContext = requestToolsOverride?.find((tool) => tool.name === "norn_read_tool_result" && tool.kind === "context");
-    if (!requestToolsOverride && providerTools.length > 0 || offeredContext) {
+    if (!requestToolsOverride && hasRecoverableTools || offeredContext) {
       providerTools.push(this.createRecordedProviderTool(parentHop, {
         name: "norn_read_tool_result",
         providerName: offeredContext?.providerName ?? "norn_read_tool_result",
@@ -200583,7 +200799,7 @@ ${TOOL_RESULT_RECOVERY_INSTRUCTIONS}`;
       }, async (input2) => this.toolResultStore.read(input2, parentHop.invocationId)));
     }
     const offeredSearch = requestToolsOverride?.find((tool) => tool.name === "norn_search_tool_results" && tool.kind === "context");
-    if (!requestToolsOverride && providerTools.length > 0 || offeredSearch) {
+    if (!requestToolsOverride && hasRecoverableTools || offeredSearch) {
       providerTools.push(this.createRecordedProviderTool(parentHop, {
         name: "norn_search_tool_results",
         providerName: offeredSearch?.providerName ?? "norn_search_tool_results",
@@ -201927,7 +202143,7 @@ function isSafeProjectRelativePath(value) {
   return isRelativePath(value) && !normalizePathSeparators(value).split("/").includes("..");
 }
 function isAgentToolCall(value) {
-  return isObjectRecord2(value) && typeof value.name === "string" && (value.kind === void 0 || value.kind === "mcp" || value.kind === "agent" || value.kind === "knowledge" || value.kind === "context") && isObjectRecord2(value.input) && isFiniteNonNegativeNumber(value.ms) && (value.childInvocationId === void 0 || typeof value.childInvocationId === "string");
+  return isObjectRecord2(value) && typeof value.name === "string" && (value.kind === void 0 || value.kind === "mcp" || value.kind === "agent" || value.kind === "knowledge" || value.kind === "context" || value.kind === "journal") && isObjectRecord2(value.input) && isFiniteNonNegativeNumber(value.ms) && (value.childInvocationId === void 0 || typeof value.childInvocationId === "string");
 }
 function isAgentKnowledgeTopicSnapshot(value) {
   return isObjectRecord2(value) && typeof value.topicHash === "string" && (value.heading === void 0 || typeof value.heading === "string") && isFiniteNonNegativeNumber(value.estimatedTokens) && isStringArray(value.itemPaths);
@@ -201943,7 +202159,7 @@ function isAgentRequestSnapshot(value) {
     (message) => isObjectRecord2(message) && (message.role === "user" || message.role === "assistant") && typeof message.content === "string"
   );
   const validTools = value.tools.every(
-    (tool) => isObjectRecord2(tool) && typeof tool.name === "string" && typeof tool.providerName === "string" && (tool.kind === void 0 || tool.kind === "mcp" || tool.kind === "agent" || tool.kind === "knowledge" || tool.kind === "context") && (tool.description === void 0 || typeof tool.description === "string") && isObjectRecord2(tool.inputSchema)
+    (tool) => isObjectRecord2(tool) && typeof tool.name === "string" && typeof tool.providerName === "string" && (tool.kind === void 0 || tool.kind === "mcp" || tool.kind === "agent" || tool.kind === "knowledge" || tool.kind === "context" || tool.kind === "journal") && (tool.description === void 0 || typeof tool.description === "string") && isObjectRecord2(tool.inputSchema)
   );
   const validKnowledge = value.knowledge === void 0 || isObjectRecord2(value.knowledge) && typeof value.knowledge.runId === "string" && typeof value.knowledge.snapshotId === "string" && isStringArray(value.knowledge.declarationIds) && ["exact_entity", "lexical_unique", "lexical_ambiguous", "no_match"].includes(
     String(value.knowledge.routingRule)
@@ -207581,7 +207797,19 @@ ${describeUnmetExpectations(verdict).map((line2) => `  - ${line2}`).join("\n")}`
                   nestingDepth,
                   agentActivity
                 });
-              }
+              },
+              ...executionContext?.agentWorkJournal ? {
+                onJournalEvent: (agentJournal) => {
+                  onProgress?.({
+                    currentStep: stepIdx + 1,
+                    totalSteps,
+                    stepType: "agent",
+                    stepDescription: `${agentJournal.agent} work journal`,
+                    nestingDepth,
+                    agentJournal
+                  });
+                }
+              } : {}
             });
             const run = await runner.run(agent, input2);
             hop = run.hop;
@@ -208052,7 +208280,7 @@ ${describeUnmetExpectations(verdict).map((line2) => `  - ${line2}`).join("\n")}`
             let requestText = `${parsed.method} ${parsed.url}`;
             const contentLines = step.content.split("\n");
             if (contentLines.length > 1) {
-              const extraLines = contentLines.slice(1).map((line2) => substituteVariables(line2, runtimeVariables));
+              const extraLines = contentLines.slice(1);
               const hasExplicitBlank = extraLines.some((line2) => line2.trim() === "");
               const firstNonEmpty = extraLines.find((line2) => line2.trim() !== "");
               const startsWithHeader = firstNonEmpty ? /^[A-Za-z0-9\-_]+\s*:/.test(firstNonEmpty.trim()) : false;
@@ -208295,6 +208523,7 @@ ${indentMultiline(userMessage)}`;
               agentEventLog,
               agentRootInvocationCounts,
               recordAgentRuns: executionContext?.recordAgentRuns,
+              agentWorkJournal: executionContext?.agentWorkJournal,
               agentRecordingOutputPath: executionContext?.agentRecordingOutputPath,
               knowledgeCoordinator,
               signal: executionContext?.signal
@@ -209528,7 +209757,7 @@ function formatAgentHopAtDepth(hop, options, displayDepth) {
   const renderedChildren = /* @__PURE__ */ new Set();
   const childrenByInvocationId = new Map(hop.children.map((child) => [child.invocationId, child]));
   for (const toolCall of hop.output.toolCalls) {
-    if (toolCall.kind === "context" || toolCall.kind === "knowledge" && isKnowledgeAlreadyLoaded(toolCall.output)) {
+    if (toolCall.kind === "context" || toolCall.kind === "journal" || toolCall.kind === "knowledge" && isKnowledgeAlreadyLoaded(toolCall.output)) {
       continue;
     }
     if (toolCall.kind === "agent" || toolCall.childInvocationId) {
@@ -214683,7 +214912,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.5.1"}`);
+    console.log(`Norn CLI ${"4.6.1"}`);
     return;
   }
   if (args.length === 0) {

package/package.json

@@ -2,7 +2,7 @@
   "name": "norn-cli",
   "displayName": "Norn",
   "description": "Build version-controlled agentic flows in VS Code and run them from the CLI or CI.",
-  "version": "4.6.0",
+  "version": "4.6.2",
   "publisher": "Norn-PeterKrustanov",
   "author": {
     "name": "Peter Krastanov"