@cydm/pie 1.0.2 → 1.0.4

package/dist/builtin/extensions/subagent/index.js

@@ -3716,6 +3716,9 @@ function logHttp(level, message, data) {
     }
   }
 }
+function isAbortErrorMessage(message) {
+  return message === "Request was aborted" || message === "Operation aborted";
+}
 initLogFile();
 var nodeHttps = null;
 var nodeHttp = null;
@@ -3976,6 +3979,13 @@ var NodeHttpClient = class {
         resolve(response);
       });
       req.on("error", (e) => {
+        if (isAbortErrorMessage(e.message) && options.signal?.aborted) {
+          logHttp("DEBUG", `Request [${requestId}] aborted`, {
+            totalTimeMs: Date.now() - requestStartTime
+          });
+          reject(e);
+          return;
+        }
         logHttp("ERROR", `Request [${requestId}] failed`, {
           error: e.message,
           totalTimeMs: Date.now() - requestStartTime

package/dist/cli.js

@@ -4914,6 +4914,9 @@ function logHttp(level, message, data) {
     }
   }
 }
+function isAbortErrorMessage(message) {
+  return message === "Request was aborted" || message === "Operation aborted";
+}
 function getNodeHttps() {
   if (!nodeHttps) {
     nodeHttps = require3("https");
@@ -5184,6 +5187,13 @@ var init_http = __esm({
             resolve5(response);
           });
           req.on("error", (e) => {
+            if (isAbortErrorMessage(e.message) && options.signal?.aborted) {
+              logHttp("DEBUG", `Request [${requestId}] aborted`, {
+                totalTimeMs: Date.now() - requestStartTime
+              });
+              reject(e);
+              return;
+            }
             logHttp("ERROR", `Request [${requestId}] failed`, {
               error: e.message,
               totalTimeMs: Date.now() - requestStartTime
@@ -65450,6 +65460,7 @@ init_file_logger();
 import * as fs4 from "node:fs";
 import * as os2 from "os";
 import * as path3 from "path";
+import { pathToFileURL } from "node:url";
 
 // src/config.ts
 import { existsSync as existsSync3, mkdirSync as mkdirSync4, readFileSync as readFileSync2, renameSync } from "fs";
@@ -65823,7 +65834,7 @@ function resolvePath(extPath, cwd) {
 }
 async function loadExtensionModule(extensionPath) {
   try {
-    const module = await import(extensionPath);
+    const module = await import(normalizeExtensionImportPath(extensionPath));
     const factory = module.default ?? module;
     if (typeof factory !== "function") {
       return null;
@@ -65835,6 +65846,15 @@ async function loadExtensionModule(extensionPath) {
     );
   }
 }
+function normalizeExtensionImportPath(extensionPath) {
+  if (/^[a-zA-Z]:[\\/]/.test(extensionPath)) {
+    return `file:///${extensionPath.replace(/\\/g, "/")}`;
+  }
+  if (path3.isAbsolute(extensionPath)) {
+    return pathToFileURL(extensionPath).href;
+  }
+  return extensionPath;
+}
 async function loadExtension2(extensionPath, cwd, uiContext, abortFn, isIdleFn, hasUI, actions) {
   const resolvedPath = resolvePath(extensionPath, cwd);
   if (!fs4.existsSync(resolvedPath)) {
@@ -69294,6 +69314,75 @@ function findFirstChangedLine(oldText, newText) {
   return void 0;
 }
 
+// src/todo/render.ts
+var TODO_STATUS_ICONS = {
+  completed: "\u2713",
+  "in-progress": "\u25C9",
+  "not-started": "\u25CB"
+};
+function formatTodoTitle(todo, activeTheme) {
+  if (todo.status === "completed") {
+    return activeTheme.fg("dim", activeTheme.strikethrough(todo.title));
+  }
+  if (todo.status === "in-progress") {
+    return activeTheme.fg("warning", todo.title);
+  }
+  return activeTheme.fg("muted", todo.title);
+}
+function formatTodoIcon(todo, activeTheme) {
+  const icon = TODO_STATUS_ICONS[todo.status] ?? "?";
+  if (todo.status === "completed") {
+    return activeTheme.fg("success", icon);
+  }
+  if (todo.status === "in-progress") {
+    return activeTheme.fg("warning", icon);
+  }
+  return activeTheme.fg("muted", icon);
+}
+function renderManageTodoListCall(args, activeTheme = theme) {
+  let text = activeTheme.fg("toolTitle", activeTheme.bold("manage_todo_list "));
+  text += activeTheme.fg("muted", args.operation || "...");
+  if (args.operation === "write" && Array.isArray(args.todoList)) {
+    const count = args.todoList.length;
+    text += activeTheme.fg("dim", ` (${count} item${count === 1 ? "" : "s"})`);
+  }
+  return text;
+}
+function renderManageTodoListResult(result, options, activeTheme = theme) {
+  const details = result.details;
+  if (!details) {
+    const firstText = result.content?.find((item) => item.type === "text" && typeof item.text === "string")?.text;
+    return firstText || "";
+  }
+  if (details.error) {
+    return activeTheme.fg("error", `\u2717 ${details.error}`);
+  }
+  const todos = details.todos || [];
+  if (todos.length === 0) {
+    return activeTheme.fg("dim", "No todos");
+  }
+  const completed = todos.filter((todo) => todo.status === "completed").length;
+  let text = `${activeTheme.fg("success", "\u2713")} ${activeTheme.fg("muted", `${completed}/${todos.length} completed`)}`;
+  if (options.expanded) {
+    for (const todo of todos) {
+      text += `
+  ${formatTodoIcon(todo, activeTheme)} ${activeTheme.fg("accent", `${todo.id}.`)} ${formatTodoTitle(todo, activeTheme)}`;
+    }
+  }
+  return text;
+}
+function renderTodoWidgetLines(todos, activeTheme = theme) {
+  if (todos.length === 0) {
+    return [];
+  }
+  const completed = todos.filter((todo) => todo.status === "completed").length;
+  const lines = [activeTheme.fg("muted", `Todo List - ${completed}/${todos.length} completed`)];
+  for (const todo of todos) {
+    lines.push(` ${formatTodoIcon(todo, activeTheme)} ${activeTheme.fg("accent", `${todo.id}.`)} ${formatTodoTitle(todo, activeTheme)}`);
+  }
+  return lines;
+}
+
 // src/components/tool-execution.ts
 function formatSize3(bytes) {
   if (bytes < 1024) return `${bytes}B`;
@@ -69376,7 +69465,13 @@ var ToolExecutionComponent = class extends Container {
   formatToolExecution() {
     let text = "";
     const invalidArg = theme.fg("error", "[invalid arg]");
-    if (this.toolName === "read") {
+    if (this.toolName === "manage_todo_list") {
+      text = renderManageTodoListCall(this.args, theme);
+      if (this.result) {
+        text += `
+${renderManageTodoListResult(this.result, { expanded: this.expanded }, theme)}`;
+      }
+    } else if (this.toolName === "read") {
       const rawPath = str(this.args?.file_path ?? this.args?.path);
       const path18 = rawPath !== null ? shortenPath(rawPath) : null;
       const offset = this.args?.offset;
@@ -69712,6 +69807,27 @@ ${theme.fg("error", "Error: " + errorOutput)}`;
   }
 };
 
+// src/components/todo-widget.ts
+var TodoWidgetComponent = class extends Container {
+  state;
+  constructor(state) {
+    super();
+    this.state = state;
+    this.refresh();
+  }
+  refresh() {
+    this.clear();
+    const lines = renderTodoWidgetLines(this.state.read());
+    if (lines.length === 0) {
+      return;
+    }
+    this.addChild(new Spacer(1));
+    for (const line of lines) {
+      this.addChild(new Text(line, 1, 0));
+    }
+  }
+};
+
 // src/components/tree-selector.ts
 var RESET = "\x1B[0m";
 var INVERSE = "\x1B[7m";
@@ -74698,6 +74814,8 @@ var InteractiveMode = class {
   footerData;
   editor;
   editorContainer;
+  todoWidgetContainer;
+  todoWidget;
   keybindings;
   sessionManager;
   skills;
@@ -74807,6 +74925,11 @@ var InteractiveMode = class {
     this.skillsSection = formatSkillsForPrompt(options.skills);
   }
   options;
+  refreshTodoWidget() {
+    this.todoWidget.refresh();
+    this.todoWidgetContainer.invalidate?.();
+    this.safeRequestRender();
+  }
   async init() {
     const savedLevel = this.options.settingsManager.getDefaultThinkingLevel();
     if (savedLevel) {
@@ -74827,6 +74950,8 @@ var InteractiveMode = class {
     });
     this.updateTerminalTitle();
     this.setupUI();
+    this.options.todoState.restoreFromMessages(this.sessionManager.getMessages());
+    this.refreshTodoWidget();
     this.setupAutocomplete();
     this.setupAgentSubscription();
     this.setupEditorSubmitHandler();
@@ -75724,6 +75849,9 @@ ${newToolsSection}`
       contextWindow: this.options.model?.contextWindow ?? 0
     });
     this.editorContainer = new Container();
+    this.todoWidgetContainer = new Container();
+    this.todoWidget = new TodoWidgetComponent(this.options.todoState);
+    this.todoWidgetContainer.addChild(this.todoWidget);
     const editorTheme = getEditorTheme();
     this.editor = new Editor(this.ui, editorTheme, { paddingX: 1 });
     this.editor.onChange = () => {
@@ -75737,6 +75865,7 @@ ${newToolsSection}`
     this.editorContainer.addChild(this.editor);
     this.ui.addChild(this.chatContainer);
     this.ui.addChild(this.pendingMessagesContainer);
+    this.ui.addChild(this.todoWidgetContainer);
     this.ui.addChild(new Spacer());
     this.ui.addChild(this.footer);
     this.ui.addChild(this.editorContainer);
@@ -75976,7 +76105,18 @@ ${newToolsSection}`
           thinkingContent += content2.thinking || "";
         } else if (content2.type === "toolCall") {
           const toolCall = content2;
-          const toolId = toolCall.id || toolCall.name;
+          const contentIndex = message.content.indexOf(content2);
+          const partialToolId = `__partial_tool__:${contentIndex}`;
+          const toolId = toolCall.id || partialToolId;
+          if (toolCall.id && !this.pendingTools.has(toolCall.id) && this.pendingTools.has(partialToolId)) {
+            const existingComponent = this.pendingTools.get(partialToolId);
+            if (existingComponent) {
+              this.pendingTools.delete(partialToolId);
+              this.pendingTools.set(toolCall.id, existingComponent);
+              existingComponent.updateArgs(toolCall.arguments);
+            }
+            continue;
+          }
           if (!this.pendingTools.has(toolId)) {
             const toolComponent = new ToolExecutionComponent(
               toolCall.name,
@@ -76064,6 +76204,9 @@ ${newToolsSection}`
         );
       }
     }
+    if (event.toolName === "manage_todo_list") {
+      this.refreshTodoWidget();
+    }
     this.footer.setState({ lifecycleEvent: "tool_execution_end" });
     this.emitExtensionEvent({
       type: "tool:execution:end",
@@ -76868,6 +77011,7 @@ ${newToolsSection}`
     this.safeRequestRender();
     this.agent.abort();
     const cleanup = async () => {
+      let timedOut = false;
       try {
         await Promise.race([
           this.agent.waitForIdle(),
@@ -76876,12 +77020,19 @@ ${newToolsSection}`
           )
         ]);
       } catch {
+        timedOut = true;
+      }
+      if (timedOut || this.agent.state.isStreaming) {
+        this.agent.resetProcessingState();
       }
       this.isProcessing = false;
       this.setSubmitLock(false);
       this.isInterrupting = false;
+      this.streamingComponent = void 0;
+      this.queuedSubmissionText = void 0;
       this.footer.setState({ status: "ready" });
       this.pendingTools.clear();
+      this.ui.setFocus(this.editor);
       this.chatContainer.addChild(new Text(theme.fg("warning", "\u26A0 Interrupted by user"), 1, 0));
       this.chatContainer.addChild(new Spacer(1));
       this.safeRequestRender();
@@ -77399,11 +77550,13 @@ ${newToolsSection}`
       this.updateTerminalTitle();
       const messages = this.sessionManager.getMessages();
       const conversationMessages = messages.filter(
-        (msg) => msg.role === "user" || msg.role === "assistant"
+        (msg) => msg.role === "user" || msg.role === "assistant" || msg.role === "toolResult"
       );
       this.agent.resetProcessingState();
       this.agent.replaceMessages(conversationMessages);
       this.lastSyncedMessageCount = this.agent.state.messages.length;
+      this.options.todoState.restoreFromMessages(messages);
+      this.refreshTodoWidget();
       this.chatContainer.clear();
       this.lastStatusSpacer = void 0;
       this.lastStatusText = void 0;
@@ -78053,6 +78206,9 @@ ${args}` : skillBlock;
     this.chatContainer.addChild(new Spacer(1));
     this.chatContainer.addChild(new Text(theme.fg("accent", `$ ${command}`), 1, 0));
     this.editor.setText("");
+    const outputContainer = new Container();
+    outputContainer.addChild(new Spacer(1));
+    this.chatContainer.addChild(outputContainer);
     this.ui.requestRender();
     const { spawn: spawn3 } = await import("child_process");
     const child = spawn3("bash", ["-c", command], {
@@ -78060,16 +78216,9 @@ ${args}` : skillBlock;
       env: process.env
     });
     let output = "";
-    let isOutputAdded = false;
-    const outputContainer = new Container();
-    outputContainer.addChild(new Spacer(1));
     child.stdout.on("data", (data) => {
       const text = data.toString();
       output += text;
-      if (!isOutputAdded) {
-        this.chatContainer.addChild(outputContainer);
-        isOutputAdded = true;
-      }
       const lines = text.split("\n");
       for (const line of lines) {
         if (line || lines.indexOf(line) < lines.length - 1) {
@@ -78081,10 +78230,6 @@ ${args}` : skillBlock;
     child.stderr.on("data", (data) => {
       const text = data.toString();
       output += text;
-      if (!isOutputAdded) {
-        this.chatContainer.addChild(outputContainer);
-        isOutputAdded = true;
-      }
       const lines = text.split("\n");
       for (const line of lines) {
         if (line || lines.indexOf(line) < lines.length - 1) {
@@ -78719,6 +78864,177 @@ var ModelRegistry = class {
   }
 };
 
+// src/todo/state-manager.ts
+var TodoStateManager = class {
+  todos = [];
+  read() {
+    return this.todos.map((todo) => ({ ...todo }));
+  }
+  write(todos) {
+    this.todos = todos.map((todo) => ({ ...todo }));
+  }
+  clear() {
+    this.todos = [];
+  }
+  getStats() {
+    const total = this.todos.length;
+    const completed = this.todos.filter((todo) => todo.status === "completed").length;
+    const inProgress = this.todos.filter((todo) => todo.status === "in-progress").length;
+    return {
+      total,
+      completed,
+      inProgress,
+      notStarted: total - completed - inProgress
+    };
+  }
+  validate(todos) {
+    const errors = [];
+    if (!Array.isArray(todos)) {
+      return { valid: false, errors: ["todoList must be an array"] };
+    }
+    const validStatuses = /* @__PURE__ */ new Set(["not-started", "in-progress", "completed"]);
+    for (let index = 0; index < todos.length; index++) {
+      const item = todos[index];
+      const prefix = `Item ${index + 1}`;
+      if (typeof item?.id !== "number" || !Number.isInteger(item.id) || item.id < 1) {
+        errors.push(`${prefix}: 'id' must be a positive integer`);
+      }
+      if (typeof item?.title !== "string" || item.title.trim().length === 0) {
+        errors.push(`${prefix}: 'title' is required`);
+      }
+      if (typeof item?.description !== "string") {
+        errors.push(`${prefix}: 'description' must be a string`);
+      }
+      if (!validStatuses.has(item?.status)) {
+        errors.push(`${prefix}: 'status' must be one of: not-started, in-progress, completed`);
+      }
+      if (item?.id !== index + 1) {
+        errors.push(`${prefix}: ids must be sequential starting from 1`);
+      }
+    }
+    return { valid: errors.length === 0, errors };
+  }
+  restoreFromMessages(messages) {
+    this.todos = [];
+    for (const message of messages) {
+      if (message.role !== "toolResult" || message.toolName !== "manage_todo_list") {
+        continue;
+      }
+      const details = message.details;
+      if (details?.todos) {
+        this.todos = details.todos.map((todo) => ({ ...todo }));
+      }
+    }
+  }
+};
+
+// src/todo/tool.ts
+init_esm();
+function stringEnum(values, description) {
+  return Type.Union(values.map((value) => Type.Literal(value)), { description });
+}
+var TodoItemSchema = Type.Object({
+  id: Type.Number({ description: "Unique identifier for the todo. Use sequential numbers starting from 1." }),
+  title: Type.String({ description: "Concise action-oriented todo label (3-7 words). Displayed in the UI." }),
+  description: Type.String({
+    description: "Detailed context, requirements, or implementation notes for the todo item."
+  }),
+  status: stringEnum(
+    ["not-started", "in-progress", "completed"],
+    "not-started: Not begun | in-progress: Currently working | completed: Fully finished with no blockers"
+  )
+});
+var ManageTodoListParams = Type.Object({
+  operation: stringEnum(
+    ["write", "read"],
+    "write: Replace entire todo list with new content. read: Retrieve current todo list."
+  ),
+  todoList: Type.Optional(
+    Type.Array(TodoItemSchema, {
+      description: "Complete array of all todo items. Required for write. Must include ALL items."
+    })
+  )
+});
+var MANAGE_TODO_LIST_DESCRIPTION = `Manage a structured todo list to track progress and plan tasks throughout your coding session.
+
+Use this tool for complex multi-step work, especially when:
+- The task needs planning or progress tracking
+- The user provided multiple requests
+- You need to break a larger change into actionable steps
+- You are about to start or finish a tracked step
+
+Workflow:
+1. Write the full todo list with clear action items
+2. Mark the current item as in-progress before starting it
+3. Complete the work for that item
+4. Mark it completed immediately
+5. Continue until all items are done
+
+Always send the full list on write. Partial updates are not supported.`;
+function successMessage(todos) {
+  const total = todos.length;
+  const completed = todos.filter((todo) => todo.status === "completed").length;
+  let message = `Todos have been modified successfully. ${completed}/${total} completed. Ensure that you continue to use the todo list to track your progress. Please proceed with the current tasks if applicable.`;
+  if (total < 3) {
+    message += "\n\nWarning: Small todo list (<3 items). This task might not need a todo list.";
+  }
+  return message;
+}
+function createManageTodoListTool(state) {
+  return {
+    name: "manage_todo_list",
+    label: "manage_todo_list",
+    description: MANAGE_TODO_LIST_DESCRIPTION,
+    parameters: ManageTodoListParams,
+    execute: async (_toolCallId, params) => {
+      if (params.operation === "read") {
+        const todos2 = state.read();
+        return {
+          content: [
+            {
+              type: "text",
+              text: todos2.length ? JSON.stringify(todos2, null, 2) : "No todos. Use write operation to create a todo list."
+            }
+          ],
+          details: { operation: "read", todos: todos2 }
+        };
+      }
+      if (!params.todoList || !Array.isArray(params.todoList)) {
+        return {
+          content: [{ type: "text", text: "Error: todoList is required for write operation." }],
+          details: { operation: "write", todos: state.read(), error: "todoList required" },
+          isError: true
+        };
+      }
+      const todoList = params.todoList;
+      const validation = state.validate(todoList);
+      if (!validation.valid) {
+        return {
+          content: [
+            {
+              type: "text",
+              text: `Validation failed:
+${validation.errors.map((error) => `  - ${error}`).join("\n")}`
+            }
+          ],
+          details: {
+            operation: "write",
+            todos: state.read(),
+            error: validation.errors.join("; ")
+          },
+          isError: true
+        };
+      }
+      state.write(todoList);
+      const todos = state.read();
+      return {
+        content: [{ type: "text", text: successMessage(todos) }],
+        details: { operation: "write", todos }
+      };
+    }
+  };
+}
+
 // src/cli.ts
 enableEarlyLogBuffer();
 var logError = (msg, err) => {
@@ -78810,7 +79126,8 @@ async function startChat(initialPrompt, testCommand) {
   settingsManager.setDefaultModelAndProvider(provider, modelId);
   const cwd = process.cwd();
   const fsOptions = { allowlistedDirs: [CONFIG_DIR] };
-  const tools = [...createFileSystemTools(cwd, fsOptions), createBashTool(cwd)];
+  const todoState = new TodoStateManager();
+  const tools = [...createFileSystemTools(cwd, fsOptions), createBashTool(cwd), createManageTodoListTool(todoState)];
   const sessionManager = createSessionManager({ sessionsDir: SESSIONS_DIR });
   if (explicitSessionId) {
     const loaded = await sessionManager.loadSession(explicitSessionId);
@@ -78928,6 +79245,7 @@ Current working directory: ${cwd}${skillsSection}`;
     model,
     apiKey,
     tools,
+    todoState,
     sessionManager,
     skills,
     cwd,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@cydm/pie",
-	"version": "1.0.2",
+	"version": "1.0.4",
 	"description": "Pie AI Agent CLI",
 	"type": "module",
 	"bin": {