@nuvin/session 0.2.0-rc.9 → 0.2.1-rc.0

package/dist/state/tool-preview.js

@@ -1,5 +1,127 @@
-// src/state/tool-preview.ts
+// src/state/file-edit-preview.ts
+function asObj(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return void 0;
+  return value;
+}
 function str(obj, key) {
+  if (!obj) return void 0;
+  const value = obj[key];
+  return typeof value === "string" && value.trim().length > 0 ? value.trim() : void 0;
+}
+function rawString(obj, key) {
+  if (!obj) return void 0;
+  const value = obj[key];
+  return typeof value === "string" ? value : void 0;
+}
+function bool(obj, key) {
+  if (!obj) return void 0;
+  const value = obj[key];
+  return typeof value === "boolean" ? value : void 0;
+}
+var LINE_NUMBER_KEYS = [
+  "oldStartLine",
+  "oldEndLine",
+  "newStartLine",
+  "newEndLine",
+  "oldLineCount",
+  "newLineCount"
+];
+function lineNumbers(value) {
+  const obj = asObj(value);
+  if (!obj) return void 0;
+  const candidate = {};
+  for (const key of LINE_NUMBER_KEYS) {
+    const number = obj[key];
+    if (typeof number !== "number" || !Number.isSafeInteger(number)) return void 0;
+    candidate[key] = number;
+  }
+  return candidate;
+}
+var ANCHORED_FILE_ERROR_CODES = [
+  "invalid_patch",
+  "unknown_snapshot",
+  "ambiguous_snapshot_tag",
+  "stale_snapshot",
+  "unseen_lines",
+  "invalid_range",
+  "overlapping_operations",
+  "no_change",
+  "write_failed",
+  "post_write_drift"
+];
+function errorCode(obj) {
+  if (!obj) return void 0;
+  const value = obj.error;
+  return typeof value === "string" && ANCHORED_FILE_ERROR_CODES.includes(value) ? value : void 0;
+}
+var ANCHORED_MODES = ["anchored-json", "hashline"];
+function canonicalMode(value) {
+  return typeof value === "string" && ANCHORED_MODES.includes(value) ? value : void 0;
+}
+function canonicalBlock(value) {
+  const obj = asObj(value);
+  if (!obj) return void 0;
+  const oldText = rawString(obj, "oldText");
+  const newText = rawString(obj, "newText");
+  if (oldText === void 0 || newText === void 0) return void 0;
+  const blockLineNumbers = lineNumbers(obj.lineNumbers);
+  return blockLineNumbers === void 0 ? { oldText, newText } : { oldText, newText, lineNumbers: blockLineNumbers };
+}
+function canonicalPreview(value) {
+  const obj = asObj(value);
+  if (!obj) return void 0;
+  const mode = canonicalMode(obj.mode);
+  const filePath = str(obj, "filePath");
+  if (mode === void 0 || filePath === void 0) return void 0;
+  if (str(obj, "canonicalPath") === void 0 || str(obj, "tag") === void 0 || str(obj, "digest") === void 0 || typeof obj.operationCount !== "number" || !Array.isArray(obj.operations) || !Array.isArray(obj.blocks)) {
+    return void 0;
+  }
+  const blocks = [];
+  for (const block of obj.blocks) {
+    const parsed = canonicalBlock(block);
+    if (parsed !== void 0) blocks.push(parsed);
+  }
+  if (blocks.length === 0) return void 0;
+  return { mode, filePath, blocks };
+}
+function withMetadata(base, input, structured) {
+  const description = str(input, "description");
+  const dryRun = bool(structured, "dryRun") ?? bool(input, "dryRun");
+  const code = errorCode(structured);
+  return {
+    ...base,
+    ...description === void 0 ? {} : { description },
+    ...dryRun === void 0 ? {} : { dryRun },
+    ...code === void 0 ? {} : { errorCode: code }
+  };
+}
+function exactPreview(input, structured) {
+  const oldText = rawString(input, "oldText");
+  const newText = rawString(input, "newText");
+  if (oldText === void 0 || newText === void 0) return void 0;
+  const exactLineNumbers = lineNumbers(structured?.lineNumbers) ?? lineNumbers(input?.lineNumbers);
+  const block = exactLineNumbers === void 0 ? { oldText, newText } : { oldText, newText, lineNumbers: exactLineNumbers };
+  const filePath = str(input, "filePath");
+  const base = { mode: "exact", blocks: [block] };
+  if (filePath !== void 0) base.filePath = filePath;
+  return withMetadata(base, input, structured);
+}
+function extractFileEditPreview(input, structured, options) {
+  const inputObj = asObj(input);
+  const structuredObj = asObj(structured);
+  const exact = exactPreview(inputObj, structuredObj);
+  if (exact !== void 0) return exact;
+  const completed = canonicalPreview(structuredObj?.preview);
+  if (completed !== void 0) return withMetadata(completed, inputObj, structuredObj);
+  if (options?.allowApprovalInputPreview === true) {
+    const approval = canonicalPreview(inputObj?.preview);
+    if (approval !== void 0) return withMetadata(approval, inputObj, structuredObj);
+  }
+  return void 0;
+}
+
+// src/state/tool-preview.ts
+function str2(obj, key) {
   if (!obj) return void 0;
   const v = obj[key];
   return typeof v === "string" && v.trim().length > 0 ? v.trim() : void 0;
@@ -9,17 +131,21 @@ function num(obj, key) {
   const v = obj[key];
   return typeof v === "number" ? v : void 0;
 }
-function bool(obj, key) {
+function bool2(obj, key) {
   return obj?.[key] === true;
 }
-function asObj(value) {
+function asObj2(value) {
   if (!value || typeof value !== "object" || Array.isArray(value)) return void 0;
   return value;
 }
+function getMemoryToolInput(value) {
+  const outer = asObj2(value);
+  return asObj2(outer?.input) ?? outer;
+}
 function parseMcpToolIdentity(toolName, structured) {
-  const obj = asObj(structured);
-  const structuredServer = str(obj, "serverName");
-  const structuredTool = str(obj, "toolName");
+  const obj = asObj2(structured);
+  const structuredServer = str2(obj, "serverName");
+  const structuredTool = str2(obj, "toolName");
   if (structuredServer && structuredTool) {
     return { serverName: structuredServer, toolName: structuredTool };
   }
@@ -45,9 +171,9 @@ function parseMcpToolIdentity(toolName, structured) {
   };
 }
 var Bash_fmt = (msg) => {
-  const input = asObj(msg.input);
-  const command = str(input, "command") ?? msg.summary;
-  const cwd = str(input, "cwd");
+  const input = asObj2(msg.input);
+  const command = str2(input, "command") ?? msg.summary;
+  const cwd = str2(input, "cwd");
   const mainArg = cwd ? `${command} at ${cwd}` : command;
   let phrase = "Ran command";
   if (msg.status === "pending") phrase = "Waiting to run command";
@@ -58,9 +184,9 @@ var Bash_fmt = (msg) => {
   return { mainArg, phrase };
 };
 var WebSearch_fmt = (msg) => {
-  const input = asObj(msg.input);
-  const structured = asObj(msg.structured);
-  const query = str(input, "query") ?? msg.summary;
+  const input = asObj2(msg.input);
+  const structured = asObj2(msg.structured);
+  const query = str2(input, "query") ?? msg.summary;
   let phrase;
   if (msg.status === "pending") phrase = "Waiting to search web";
   else if (msg.status === "running" || msg.status === "approved") phrase = "Searching web";
@@ -73,23 +199,23 @@ var WebSearch_fmt = (msg) => {
   return { mainArg: query, phrase };
 };
 var WebFetch_fmt = (msg) => {
-  const input = asObj(msg.input);
-  const structured = asObj(msg.structured);
-  const url = str(input, "url") ?? msg.summary;
+  const input = asObj2(msg.input);
+  const structured = asObj2(msg.structured);
+  const url = str2(input, "url") ?? msg.summary;
   let phrase;
   if (msg.status === "pending") phrase = "Waiting to fetch URL";
   else if (msg.status === "running" || msg.status === "approved") phrase = "Fetching URL";
   else if (msg.status === "rejected") phrase = "Skipped fetch";
   else if (msg.status === "error") phrase = "Fetch failed";
   else {
-    const format = str(structured, "format");
+    const format = str2(structured, "format");
     phrase = format ? `Fetched ${format}` : "Fetched";
   }
   return { mainArg: url, phrase };
 };
 var FileRead_fmt = (msg) => {
-  const input = asObj(msg.input);
-  const filePath = str(input, "path") ?? msg.summary;
+  const input = asObj2(msg.input);
+  const filePath = str2(input, "path") ?? msg.summary;
   const lineStart = num(input, "lineStart");
   const lineEnd = num(input, "lineEnd");
   let mainArg = filePath;
@@ -104,9 +230,10 @@ var FileRead_fmt = (msg) => {
   return { mainArg, phrase };
 };
 var FileEdit_fmt = (msg) => {
-  const input = asObj(msg.input);
-  const structured = asObj(msg.structured);
-  const filePath = str(structured, "filePath") ?? str(input, "filePath") ?? msg.summary;
+  const input = asObj2(msg.input);
+  const structured = asObj2(msg.structured);
+  const preview = extractFileEditPreview(msg.input, msg.structured);
+  const filePath = preview?.filePath ?? str2(structured, "filePath") ?? str2(input, "filePath") ?? msg.summary;
   const bytesWritten = num(structured, "bytesWritten");
   let phrase;
   if (msg.status === "error") phrase = "Edit failed";
@@ -117,9 +244,9 @@ var FileEdit_fmt = (msg) => {
   return { mainArg: filePath, phrase };
 };
 var FileNew_fmt = (msg) => {
-  const input = asObj(msg.input);
-  const structured = asObj(msg.structured);
-  const filePath = str(structured, "filePath") ?? str(input, "filePath") ?? msg.summary;
+  const input = asObj2(msg.input);
+  const structured = asObj2(msg.structured);
+  const filePath = str2(structured, "filePath") ?? str2(input, "filePath") ?? msg.summary;
   const lines = num(structured, "lines");
   const bytes = num(structured, "bytes");
   let phrase = "Created file";
@@ -134,10 +261,10 @@ var FileNew_fmt = (msg) => {
   return { mainArg: filePath, phrase };
 };
 var Grep_fmt = (msg) => {
-  const input = asObj(msg.input);
-  const structured = asObj(msg.structured);
-  const pattern = str(input, "pattern") ?? "";
-  const searchPath = str(input, "path");
+  const input = asObj2(msg.input);
+  const structured = asObj2(msg.structured);
+  const pattern = str2(input, "pattern") ?? "";
+  const searchPath = str2(input, "path");
   const mainArg = searchPath ? `${pattern} at ${searchPath}` : pattern || msg.summary;
   let phrase;
   if (msg.status === "pending") phrase = "Waiting to search";
@@ -147,7 +274,7 @@ var Grep_fmt = (msg) => {
   else {
     const matchCount = num(structured, "matchCount");
     const fileCount = num(structured, "fileCount");
-    const truncated = bool(structured, "truncated");
+    const truncated = bool2(structured, "truncated");
     if (matchCount === 0) phrase = "Not found";
     else if (matchCount === void 0) phrase = "Search complete";
     else {
@@ -159,9 +286,9 @@ var Grep_fmt = (msg) => {
   return { mainArg, phrase };
 };
 var Glob_fmt = (msg) => {
-  const input = asObj(msg.input);
-  const structured = asObj(msg.structured);
-  const pattern = str(input, "pattern") ?? msg.summary;
+  const input = asObj2(msg.input);
+  const structured = asObj2(msg.structured);
+  const pattern = str2(input, "pattern") ?? msg.summary;
   let phrase;
   if (msg.status === "pending") phrase = "Waiting to find files";
   else if (msg.status === "running" || msg.status === "approved") phrase = "Finding files";
@@ -169,16 +296,16 @@ var Glob_fmt = (msg) => {
   else if (msg.status === "error") phrase = "Search failed";
   else {
     const count = num(structured, "count");
-    const truncated = bool(structured, "truncated");
+    const truncated = bool2(structured, "truncated");
     phrase = count !== void 0 ? `Found ${count} file${count === 1 ? "" : "s"}` : "Search complete";
     if (truncated) phrase += " (truncated)";
   }
   return { mainArg: pattern, phrase };
 };
 var Ls_fmt = (msg) => {
-  const input = asObj(msg.input);
-  const structured = asObj(msg.structured);
-  const directoryPath = str(input, "path") ?? ".";
+  const input = asObj2(msg.input);
+  const structured = asObj2(msg.structured);
+  const directoryPath = str2(input, "path") ?? ".";
   let phrase;
   if (msg.status === "pending") phrase = "Waiting to list directory";
   else if (msg.status === "running" || msg.status === "approved") phrase = "Listing directory";
@@ -186,18 +313,18 @@ var Ls_fmt = (msg) => {
   else if (msg.status === "error") phrase = "Listing failed";
   else {
     const total = num(structured, "total");
-    const truncated = bool(structured, "truncated");
+    const truncated = bool2(structured, "truncated");
     phrase = total !== void 0 ? `Listed ${total} entries` : "Listed";
     if (truncated) phrase += " (truncated)";
   }
   return { mainArg: directoryPath, phrase };
 };
 var Lsp_fmt = (msg) => {
-  const input = asObj(msg.input);
-  const filePath = str(input, "filePath") ?? msg.summary;
+  const input = asObj2(msg.input);
+  const filePath = str2(input, "filePath") ?? msg.summary;
   const line = num(input, "line");
   const character = num(input, "character");
-  const operation = str(input, "operation") ?? "lsp";
+  const operation = str2(input, "operation") ?? "lsp";
   let mainArg = filePath;
   if (line !== void 0 && character !== void 0) mainArg = `${filePath}:${line}:${character}`;
   else if (line !== void 0) mainArg = `${filePath}:${line}`;
@@ -210,8 +337,8 @@ var Lsp_fmt = (msg) => {
   return { mainArg, phrase };
 };
 var LoadSkill_fmt = (msg) => {
-  const input = asObj(msg.input);
-  const name = str(input, "name") ?? msg.summary;
+  const input = asObj2(msg.input);
+  const name = str2(input, "name") ?? msg.summary;
   let phrase;
   if (msg.status === "pending") phrase = "Waiting to load skill";
   else if (msg.status === "running" || msg.status === "approved") phrase = "Loading skill";
@@ -221,8 +348,8 @@ var LoadSkill_fmt = (msg) => {
   return { mainArg: name, phrase };
 };
 var ViewFile_fmt = (msg) => {
-  const input = asObj(msg.input);
-  const filePath = str(input, "path") ?? msg.summary;
+  const input = asObj2(msg.input);
+  const filePath = str2(input, "path") ?? msg.summary;
   let phrase;
   if (msg.status === "pending") phrase = "Waiting to view image";
   else if (msg.status === "running" || msg.status === "approved") phrase = "Viewing image";
@@ -232,8 +359,8 @@ var ViewFile_fmt = (msg) => {
   return { mainArg: filePath, phrase };
 };
 var TodoWrite_fmt = (msg) => {
-  const input = asObj(msg.input);
-  const structured = asObj(msg.structured);
+  const input = asObj2(msg.input);
+  const structured = asObj2(msg.structured);
   const todos = input?.todos ?? input?.items;
   const count = Array.isArray(todos) ? todos.length : void 0;
   const mainArg = count === void 0 ? msg.summary : `${count} item${count === 1 ? "" : "s"}`;
@@ -243,18 +370,18 @@ var TodoWrite_fmt = (msg) => {
   else if (msg.status === "rejected") phrase = "Skipped todo update";
   else if (msg.status === "error") phrase = "Todo update failed";
   else {
-    const stats = asObj(structured?.stats);
+    const stats = asObj2(structured?.stats);
     const completed = num(stats, "completed");
     const total = num(stats, "total");
-    const progress = str(structured, "progress");
+    const progress = str2(structured, "progress");
     phrase = completed !== void 0 && total !== void 0 && progress ? `Updated todos (${completed}/${total} - ${progress})` : "Updated todos";
   }
   return { mainArg, phrase };
 };
 var UpdateTopic_fmt = (msg) => {
-  const input = asObj(msg.input);
-  const structured = asObj(msg.structured);
-  const mainArg = str(structured, "topic") ?? str(input, "topic") ?? (msg.summary || void 0);
+  const input = asObj2(msg.input);
+  const structured = asObj2(msg.structured);
+  const mainArg = str2(structured, "topic") ?? str2(input, "topic") ?? (msg.summary || void 0);
   let phrase = "Updated topic";
   if (msg.status === "pending") phrase = "Waiting to update topic";
   else if (msg.status === "running" || msg.status === "approved") phrase = "Updating topic";
@@ -263,10 +390,10 @@ var UpdateTopic_fmt = (msg) => {
   return { mainArg, phrase };
 };
 var InvokeCommand_fmt = (msg) => {
-  const input = asObj(msg.input);
-  const structured = asObj(msg.structured);
-  const name = str(structured, "name") ?? str(input, "name");
-  const args = str(input, "args");
+  const input = asObj2(msg.input);
+  const structured = asObj2(msg.structured);
+  const name = str2(structured, "name") ?? str2(input, "name");
+  const args = str2(input, "args");
   const slash = name ? `/${name}` : void 0;
   const mainArg = slash && args ? `${slash} with ${args}` : slash;
   let phrase = "Invoked";
@@ -277,10 +404,10 @@ var InvokeCommand_fmt = (msg) => {
   return { mainArg, phrase };
 };
 var Memory_fmt = (msg) => {
-  const input = asObj(msg.input);
-  const structured = asObj(msg.structured);
-  const operation = str(input, "operation") ?? "update";
-  const mainArg = str(structured, "slug") ?? str(input, "slug") ?? str(input, "title");
+  const input = getMemoryToolInput(msg.input);
+  const structured = asObj2(msg.structured);
+  const operation = str2(input, "operation") ?? "update";
+  const mainArg = str2(structured, "slug") ?? str2(input, "slug") ?? str2(input, "title");
   const verb = operation === "create" ? "create" : operation === "remove" ? "remove" : "edit";
   let phrase = verb === "create" ? "Created memory" : verb === "remove" ? "Removed memory" : "Edited memory";
   if (msg.status === "pending") phrase = `Waiting to ${verb} memory`;
@@ -291,10 +418,10 @@ var Memory_fmt = (msg) => {
   return { mainArg, phrase };
 };
 var MemoryRead_fmt = (msg) => {
-  const input = asObj(msg.input);
-  const structured = asObj(msg.structured);
-  const slug = str(input, "slug");
-  const pattern = str(input, "pattern");
+  const input = getMemoryToolInput(msg.input);
+  const structured = asObj2(msg.structured);
+  const slug = str2(input, "slug");
+  const pattern = str2(input, "pattern");
   const mainArg = slug ?? pattern ?? "all";
   let phrase;
   if (msg.status === "pending") phrase = "Waiting to read memory";
@@ -408,7 +535,9 @@ function getTodoItems(value) {
   });
 }
 export {
+  extractFileEditPreview,
   formatToolPreviewLine,
+  getMemoryToolInput,
   getTodoItems,
   getToolPreview,
   getToolStatusGlyph,

package/dist/test-utils/index.js

@@ -1,12 +1,12 @@
 import "../chunk-7LEIACBZ.js";
 import {
   PROTOCOL_VERSION
-} from "../chunk-O3UBTUIO.js";
+} from "../chunk-FAYWOY6R.js";
 import {
   generateGrantKeyPair,
   signGrant
-} from "../chunk-TUNCGICQ.js";
-import "../chunk-HJLRL64D.js";
+} from "../chunk-5XT7AOI2.js";
+import "../chunk-4UBSHJWS.js";
 
 // src/test-utils/fake-relay.ts
 import { randomUUID } from "crypto";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuvin/session",
-  "version": "0.2.0-rc.9",
+  "version": "0.2.1-rc.0",
   "private": false,
   "description": "Headless session layer for Nuvin: state reducers, wire protocol, session controller",
   "license": "Apache-2.0",
@@ -50,7 +50,7 @@
   },
   "dependencies": {
     "ws": "^8.20.0",
-    "@nuvin/agent-core": "^0.2.0-rc.6"
+    "@nuvin/agent-core": "^0.2.1-rc.0"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",