@freesyntax/notch-cli 0.5.12 → 0.5.14

package/dist/index.js

@@ -2576,7 +2576,7 @@ async function buildSystemPrompt(projectRoot, modelId) {
   } catch {
   }
   try {
-    const memoryStr = await formatMemoriesForPrompt(projectRoot);
+    const memoryStr = await formatMemoriesForPrompt();
     if (memoryStr) {
       parts.push("", "## Saved Context (Memory)", memoryStr);
     }
@@ -6390,8 +6390,8 @@ function clearMenu(state) {
   if (state.renderedLines === 0) return "";
   const lines = state.renderedLines;
   state.renderedLines = 0;
-  let ansi = "";
-  for (let i = 0; i < lines; i++) {
+  let ansi = "\x1B[2K";
+  for (let i = 0; i < lines + 1; i++) {
     ansi += "\x1B[1A\x1B[2K";
   }
   return ansi;
@@ -6456,16 +6456,15 @@ function attachSlashMenu(rl) {
         const shouldShow = updateMenu(state, line);
         if (wasVisible && !shouldShow) {
           process.stdout.write(clearMenu(state));
+          rewritePromptLine(rl);
         } else if (shouldShow) {
           if (wasVisible) {
             process.stdout.write(clearMenu(state));
           }
           const menuStr = renderMenu(state);
           if (menuStr) {
-            process.stdout.write("\x1B[s");
             process.stdout.write(menuStr + "\n");
             rewritePromptLine(rl);
-            process.stdout.write("\x1B[u");
           }
         }
       }
@@ -6897,7 +6896,8 @@ Analyze the above input.`;
           promptTokens: response.usage.promptTokens,
           completionTokens: response.usage.completionTokens,
           totalTokens: response.usage.totalTokens,
-          model: activeModelId
+          toolCalls: response.toolCallCount,
+          iterations: response.iterations
         });
         costTracker.record(activeModelId, response.usage.promptTokens, response.usage.completionTokens);
         console.log(usage.formatLast() + "  " + costTracker.formatLastCost());
@@ -6942,7 +6942,7 @@ Analyze the above input.`;
       if (messages.length > 0) {
         try {
           const name = getSessionName();
-          const id = await saveSession(config.projectRoot, messages, { model: activeModelId });
+          const id = await saveSession(messages, config.projectRoot, activeModelId);
           console.log(chalk27.gray(`  Session saved: ${id}${name ? ` (${name})` : ""}`));
         } catch {
         }
@@ -7068,7 +7068,7 @@ Analyze the above input.`;
       } else {
         for (const df of diffs) {
           console.log(chalk27.cyan(`  ${df.path}:`));
-          console.log(unifiedDiff(df.before, df.after, df.path));
+          console.log(unifiedDiff(df.before ?? "", df.after ?? "", df.path));
           console.log("");
         }
       }
@@ -7076,12 +7076,11 @@ Analyze the above input.`;
       return;
     }
     if (input.startsWith("/export")) {
-      const exportPath = input.replace("/export", "").trim() || void 0;
+      const exportPath = input.replace("/export", "").trim() || "notch-export.md";
       try {
-        const ePath = await exportSession(messages, {
+        const ePath = await exportSession(messages, exportPath, {
           model: activeModelId,
-          projectRoot: config.projectRoot,
-          outputPath: exportPath
+          project: config.projectRoot
         });
         console.log(chalk27.green(`  Exported to ${ePath}
 `));
@@ -7094,7 +7093,7 @@ Analyze the above input.`;
     }
     if (input === "/save") {
       try {
-        const id = await saveSession(config.projectRoot, messages, { model: activeModelId });
+        const id = await saveSession(messages, config.projectRoot, activeModelId);
         sessionId = id;
         console.log(chalk27.green(`  Session saved: ${id}
 `));
@@ -7107,13 +7106,13 @@ Analyze the above input.`;
     }
     if (input === "/sessions") {
       try {
-        const sessions = await listSessions(config.projectRoot);
+        const sessions = await listSessions();
         if (sessions.length === 0) {
           console.log(chalk27.gray("  No saved sessions.\n"));
         } else {
           console.log(chalk27.gray("\n  Saved sessions:\n"));
           for (const s of sessions.slice(0, 10)) {
-            console.log(chalk27.gray(`    ${s.id}  ${s.turns} turns  ${s.date}  ${s.model}`));
+            console.log(chalk27.gray(`    ${s.id}  ${s.turns} turns  ${s.updated}  ${s.model}`));
           }
           console.log("");
         }
@@ -7191,7 +7190,7 @@ Analyze the above input.`;
       const task = input.replace("/plan ", "").trim();
       const planSpinner = ora4("Generating plan...").start();
       try {
-        activePlan = await generatePlan(task, model, systemPrompt);
+        activePlan = await generatePlan(task, model, { cwd: config.projectRoot, repoMap: repoMapStr || void 0, history: messages });
         planSpinner.succeed("Plan generated");
         console.log(formatPlan(activePlan));
         console.log(chalk27.gray("  Use /plan approve to execute, /plan edit to modify, or /plan cancel to discard.\n"));
@@ -7210,6 +7209,7 @@ Analyze the above input.`;
       console.log(chalk27.green("  Executing plan...\n"));
       while (!isPlanComplete(activePlan)) {
         const stepPrompt = currentStepPrompt(activePlan);
+        if (!stepPrompt) break;
         messages.push({ role: "user", content: stepPrompt });
         const planStepSpinner = ora4(`Step ${activePlan.currentStep + 1}/${activePlan.steps.length}...`).start();
         try {
@@ -7234,7 +7234,7 @@ Analyze the above input.`;
           console.log("\n");
           messages.length = 0;
           messages.push(...response.messages);
-          activePlan = advancePlan(activePlan);
+          advancePlan(activePlan);
         } catch (err) {
           planStepSpinner.fail(`Step failed: ${err.message}`);
           break;
@@ -7267,36 +7267,36 @@ Analyze the above input.`;
     }
     if (input.startsWith("/agent ")) {
       const task = input.replace("/agent ", "").trim();
-      const agentId = nextSubagentId();
+      const agentId = nextSubagentId("general");
       console.log(chalk27.cyan(`  Spawning subagent #${agentId}: ${task}
 `));
       spawnSubagent({
         id: agentId,
-        task,
+        type: "general",
+        prompt: task,
         model,
-        systemPrompt,
         toolContext: toolCtx,
-        contextWindow: MODEL_CATALOG[activeModelId].contextWindow,
-        onComplete: (result) => {
-          console.log(chalk27.green(`
+        onStatus: (id, status) => {
+          console.log(chalk27.gray(`  [${id}] ${status}`));
+        }
+      }).then((result) => {
+        console.log(chalk27.green(`
   Subagent #${agentId} finished:`));
-          console.log(chalk27.gray(`  ${result.slice(0, 200)}
+        console.log(chalk27.gray(`  ${result.text.slice(0, 200)}
 `));
-          rl.prompt();
-        },
-        onError: (err) => {
-          console.log(chalk27.red(`
-  Subagent #${agentId} failed: ${err}
+        rl.prompt();
+      }).catch((err) => {
+        console.log(chalk27.red(`
+  Subagent #${agentId} failed: ${err.message}
 `));
-          rl.prompt();
-        }
+        rl.prompt();
       });
       rl.prompt();
       return;
     }
     if (input === "/memory") {
       try {
-        const memories = await loadMemories(config.projectRoot);
+        const memories = await loadMemories();
         if (memories.length === 0) {
           console.log(chalk27.gray("  No saved memories.\n"));
         } else {
@@ -7318,7 +7318,7 @@ Analyze the above input.`;
     if (input.startsWith("/memory search ")) {
       const query = input.replace("/memory search ", "").trim();
       try {
-        const results = await searchMemories(config.projectRoot, query);
+        const results = await searchMemories(query);
         if (results.length === 0) {
           console.log(chalk27.gray(`  No memories matching "${query}"
 `));
@@ -7337,9 +7337,9 @@ Analyze the above input.`;
     }
     if (input === "/memory clear") {
       try {
-        const memories = await loadMemories(config.projectRoot);
+        const memories = await loadMemories();
         for (const m of memories) {
-          await deleteMemory(config.projectRoot, m.id);
+          await deleteMemory(m.filename);
         }
         console.log(chalk27.yellow(`  Cleared ${memories.length} memories.
 `));
@@ -7360,8 +7360,8 @@ Analyze the above input.`;
       const goal = input.replace("/ralph plan ", "").trim();
       const planSpinner = ora4("Ralph is planning...").start();
       try {
-        ralphPlan = await generateRalphPlan(goal, model, systemPrompt);
-        await savePlan(config.projectRoot, ralphPlan);
+        ralphPlan = await generateRalphPlan(goal, model, config.projectRoot);
+        await savePlan(ralphPlan, config.projectRoot);
         planSpinner.succeed(`Ralph planned ${ralphPlan.tasks.length} tasks`);
         console.log(formatRalphStatus(ralphPlan));
       } catch (err) {
@@ -7378,18 +7378,13 @@ Analyze the above input.`;
       }
       console.log(chalk27.green("  Ralph is running...\n"));
       try {
-        ralphPlan = await runRalphLoop(ralphPlan, {
-          model,
-          systemPrompt,
-          toolContext: toolCtx,
-          contextWindow: MODEL_CATALOG[activeModelId].contextWindow,
-          onTaskStart: (task) => console.log(chalk27.cyan(`  \u25B6 Task: ${task.description}`)),
-          onTaskComplete: (task) => console.log(chalk27.green(`  \u2713 Done: ${task.description}
+        ralphPlan = await runRalphLoop(ralphPlan, model, toolCtx, config.projectRoot, {
+          onTaskStart: (task) => console.log(chalk27.cyan(`  \u25B6 Task: ${task.title}`)),
+          onTaskEnd: (task) => console.log(chalk27.green(`  \u2713 Done: ${task.title}
 `)),
-          onTaskFail: (task, err) => console.log(chalk27.red(`  \u2717 Failed: ${task.description} (${err})
-`))
+          onText: (chunk) => process.stdout.write(chunk)
         });
-        await savePlan(config.projectRoot, ralphPlan);
+        await savePlan(ralphPlan, config.projectRoot);
         console.log(formatRalphStatus(ralphPlan));
       } catch (err) {
         console.log(chalk27.red(`  Ralph error: ${err.message}
@@ -7565,7 +7560,8 @@ Analyze the above input.`;
           promptTokens: response.usage.promptTokens,
           completionTokens: response.usage.completionTokens,
           totalTokens: response.usage.totalTokens,
-          model: activeModelId
+          toolCalls: response.toolCallCount,
+          iterations: response.iterations
         });
         costTracker.record(activeModelId, response.usage.promptTokens, response.usage.completionTokens);
         console.log(usage.formatLast() + "  " + costTracker.formatLastCost());
@@ -7583,8 +7579,10 @@ Analyze the above input.`;
         const memMatch = lastText.match(/\[(?:MEMORY|memory):\s*([^\]]+)\]/);
         if (memMatch) {
           try {
-            await saveMemory(config.projectRoot, {
-              type: "auto",
+            await saveMemory({
+              name: "auto-saved",
+              description: memMatch[1].slice(0, 80),
+              type: "project",
               content: memMatch[1]
             });
             console.log(chalk27.gray("  (Saved to memory)\n"));
@@ -7631,8 +7629,8 @@ async function handleRalphSubcommand(args, cliOpts) {
       process.exit(1);
     }
     const spinner = ora4("Ralph is planning...").start();
-    const plan = await generateRalphPlan(goal, model, systemPrompt);
-    await savePlan(config.projectRoot, plan);
+    const plan = await generateRalphPlan(goal, model, config.projectRoot);
+    await savePlan(plan, config.projectRoot);
     spinner.succeed(`Planned ${plan.tasks.length} tasks`);
     console.log(formatRalphStatus(plan));
   } else if (subcommand === "run") {
@@ -7641,16 +7639,12 @@ async function handleRalphSubcommand(args, cliOpts) {
       console.error(chalk27.red("  No plan found. Run: notch ralph plan <goal>"));
       process.exit(1);
     }
-    plan = await runRalphLoop(plan, {
-      model,
-      systemPrompt,
-      toolContext: toolCtx,
-      contextWindow: MODEL_CATALOG[config.models.chat.model].contextWindow,
-      onTaskStart: (t) => console.log(chalk27.cyan(`  \u25B6 ${t.description}`)),
-      onTaskComplete: (t) => console.log(chalk27.green(`  \u2713 ${t.description}`)),
-      onTaskFail: (t, e) => console.log(chalk27.red(`  \u2717 ${t.description}: ${e}`))
+    plan = await runRalphLoop(plan, model, toolCtx, config.projectRoot, {
+      onTaskStart: (t) => console.log(chalk27.cyan(`  \u25B6 ${t.title}`)),
+      onTaskEnd: (t) => console.log(chalk27.green(`  \u2713 ${t.title}`)),
+      onText: (chunk) => process.stdout.write(chunk)
     });
-    await savePlan(config.projectRoot, plan);
+    await savePlan(plan, config.projectRoot);
     console.log(formatRalphStatus(plan));
   } else if (subcommand === "status") {
     const plan = await loadPlan(config.projectRoot);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@freesyntax/notch-cli",
-  "version": "0.5.12",
+  "version": "0.5.14",
   "description": "Notch CLI — AI-powered coding assistant by Driftrail",
   "type": "module",
   "bin": {