@hasna/oldpal 0.5.4 → 0.6.2

package/dist/index.js

@@ -17702,7 +17702,7 @@ var require_stack_utils = __commonJS((exports, module) => {
 });
 
 // node_modules/.bun/@anthropic-ai+sdk@0.32.1/node_modules/@anthropic-ai/sdk/version.mjs
-var VERSION = "0.32.1";
+var VERSION2 = "0.32.1";
 
 // node_modules/.bun/@anthropic-ai+sdk@0.32.1/node_modules/@anthropic-ai/sdk/_shims/registry.mjs
 function setShims(shims, options = { auto: false }) {
@@ -18651,7 +18651,7 @@ class APIClient {
     return sleepSeconds * jitter * 1000;
   }
   getUserAgent() {
-    return `${this.constructor.name}/JS ${VERSION}`;
+    return `${this.constructor.name}/JS ${VERSION2}`;
   }
 }
 function getBrowserInfo() {
@@ -18734,7 +18734,7 @@ var __classPrivateFieldSet = function(receiver, state, value, kind2, f) {
   if (typeof Deno !== "undefined" && Deno.build != null) {
     return {
       "X-Stainless-Lang": "js",
-      "X-Stainless-Package-Version": VERSION,
+      "X-Stainless-Package-Version": VERSION2,
       "X-Stainless-OS": normalizePlatform(Deno.build.os),
       "X-Stainless-Arch": normalizeArch(Deno.build.arch),
       "X-Stainless-Runtime": "deno",
@@ -18744,7 +18744,7 @@ var __classPrivateFieldSet = function(receiver, state, value, kind2, f) {
   if (typeof EdgeRuntime !== "undefined") {
     return {
       "X-Stainless-Lang": "js",
-      "X-Stainless-Package-Version": VERSION,
+      "X-Stainless-Package-Version": VERSION2,
       "X-Stainless-OS": "Unknown",
       "X-Stainless-Arch": `other:${EdgeRuntime}`,
       "X-Stainless-Runtime": "edge",
@@ -18754,7 +18754,7 @@ var __classPrivateFieldSet = function(receiver, state, value, kind2, f) {
   if (Object.prototype.toString.call(typeof process !== "undefined" ? process : 0) === "[object process]") {
     return {
       "X-Stainless-Lang": "js",
-      "X-Stainless-Package-Version": VERSION,
+      "X-Stainless-Package-Version": VERSION2,
       "X-Stainless-OS": normalizePlatform(process.platform),
       "X-Stainless-Arch": normalizeArch(process.arch),
       "X-Stainless-Runtime": "node",
@@ -18765,7 +18765,7 @@ var __classPrivateFieldSet = function(receiver, state, value, kind2, f) {
   if (browserInfo) {
     return {
       "X-Stainless-Lang": "js",
-      "X-Stainless-Package-Version": VERSION,
+      "X-Stainless-Package-Version": VERSION2,
       "X-Stainless-OS": "Unknown",
       "X-Stainless-Arch": "unknown",
       "X-Stainless-Runtime": `browser:${browserInfo.browser}`,
@@ -18774,42 +18774,42 @@ var __classPrivateFieldSet = function(receiver, state, value, kind2, f) {
   }
   return {
     "X-Stainless-Lang": "js",
-    "X-Stainless-Package-Version": VERSION,
+    "X-Stainless-Package-Version": VERSION2,
     "X-Stainless-OS": "Unknown",
     "X-Stainless-Arch": "unknown",
     "X-Stainless-Runtime": "unknown",
     "X-Stainless-Runtime-Version": "unknown"
   };
-}, normalizeArch = (arch) => {
-  if (arch === "x32")
+}, normalizeArch = (arch2) => {
+  if (arch2 === "x32")
     return "x32";
-  if (arch === "x86_64" || arch === "x64")
+  if (arch2 === "x86_64" || arch2 === "x64")
     return "x64";
-  if (arch === "arm")
+  if (arch2 === "arm")
     return "arm";
-  if (arch === "aarch64" || arch === "arm64")
+  if (arch2 === "aarch64" || arch2 === "arm64")
     return "arm64";
-  if (arch)
-    return `other:${arch}`;
+  if (arch2)
+    return `other:${arch2}`;
   return "unknown";
-}, normalizePlatform = (platform2) => {
-  platform2 = platform2.toLowerCase();
-  if (platform2.includes("ios"))
+}, normalizePlatform = (platform3) => {
+  platform3 = platform3.toLowerCase();
+  if (platform3.includes("ios"))
     return "iOS";
-  if (platform2 === "android")
+  if (platform3 === "android")
     return "Android";
-  if (platform2 === "darwin")
+  if (platform3 === "darwin")
     return "MacOS";
-  if (platform2 === "win32")
+  if (platform3 === "win32")
     return "Windows";
-  if (platform2 === "freebsd")
+  if (platform3 === "freebsd")
     return "FreeBSD";
-  if (platform2 === "openbsd")
+  if (platform3 === "openbsd")
     return "OpenBSD";
-  if (platform2 === "linux")
+  if (platform3 === "linux")
     return "Linux";
-  if (platform2)
-    return `Other:${platform2}`;
+  if (platform3)
+    return `Other:${platform3}`;
   return "Unknown";
 }, _platformHeaders, getPlatformHeaders = () => {
   return _platformHeaders ?? (_platformHeaders = getPlatformProperties());
@@ -20530,10 +20530,34 @@ class AnthropicClient {
             currentToolCall = null;
             toolInputJson = "";
           }
+        } else if (event.type === "message_delta") {
+          if (event.usage) {
+            yield {
+              type: "usage",
+              usage: {
+                inputTokens: 0,
+                outputTokens: event.usage.output_tokens || 0,
+                totalTokens: event.usage.output_tokens || 0,
+                maxContextTokens: 200000
+              }
+            };
+          }
         } else if (event.type === "message_stop") {
           yield { type: "done" };
         }
       }
+      const finalMessage = await stream.finalMessage();
+      if (finalMessage.usage) {
+        yield {
+          type: "usage",
+          usage: {
+            inputTokens: finalMessage.usage.input_tokens,
+            outputTokens: finalMessage.usage.output_tokens,
+            totalTokens: finalMessage.usage.input_tokens + finalMessage.usage.output_tokens,
+            maxContextTokens: 200000
+          }
+        };
+      }
     } catch (error) {
       yield {
         type: "error",
@@ -29316,7 +29340,7 @@ You can review and copy this file to your project if needed.`;
     const globPattern = input.glob || "**/*";
     const caseSensitive = input.caseSensitive || false;
     try {
-      const flags = caseSensitive ? "g" : "gi";
+      const flags = caseSensitive ? "" : "i";
       const regex2 = new RegExp(pattern, flags);
       const results = [];
       const glob = new Glob(globPattern);
@@ -29868,7 +29892,7 @@ ARGUMENTS: ${args.join(" ")}`;
       const fullMatch = match[0];
       const command = match[1];
       try {
-        const fullCommand = `cd ${skillDir} && ${command}`;
+        const fullCommand = `cd "${skillDir}" && ${command}`;
         const output = await Bun.$`sh -c ${fullCommand}`.quiet().text();
         result = result.replace(fullMatch, output.trim());
       } catch (error) {
@@ -30246,8 +30270,9 @@ ${stderr}`;
 }
 // packages/core/src/commands/builtin.ts
 import { join as join6 } from "path";
-import { homedir as homedir6 } from "os";
+import { homedir as homedir6, platform as platform2, release, arch } from "os";
 import { existsSync as existsSync4, mkdirSync, writeFileSync as writeFileSync2 } from "fs";
+var VERSION = "0.6.2";
 
 class BuiltinCommands {
   tokenUsage = {
@@ -30273,6 +30298,7 @@ class BuiltinCommands {
     loader.register(this.bugCommand());
     loader.register(this.prCommand());
     loader.register(this.reviewCommand());
+    loader.register(this.feedbackCommand());
     loader.register(this.exitCommand());
   }
   updateTokenUsage(usage) {
@@ -30450,33 +30476,25 @@ class BuiltinCommands {
 **Available Skills**
 
 `;
-        message += `Skills are invoked with /skill-name [arguments]
+        message += `Skills are invoked with $skill-name [arguments] or /skill-name [arguments]
 
 `;
-        message += `**Built-in Skills:**
-`;
-        message += `  /brainstorm - Generate ideas on a topic
-`;
-        message += `  /draft - Draft content (emails, docs, etc.)
+        if (context.skills.length === 0) {
+          message += `No skills loaded.
 `;
-        message += `  /research - Research a topic
-`;
-        message += `  /summarize - Summarize text or content
-`;
-        message += `
-**Connector Skills:**
-`;
-        message += `  /calendar - Manage calendar events
-`;
-        message += `  /email - Read and send emails
-`;
-        message += `  /notes - Manage notes (Notion)
+          message += `
+Add skills to ~/.oldpal/skills/ or .oldpal/skills/
 `;
-        message += `  /search - Search the web
+        } else {
+          for (const skill of context.skills) {
+            const hint = skill.argumentHint ? ` ${skill.argumentHint}` : "";
+            message += `  $${skill.name}${hint} - ${skill.description}
 `;
-        message += `
-Custom skills can be added in .oldpal/skills/
+          }
+          message += `
+${context.skills.length} skill(s) available.
 `;
+        }
         context.emit("text", message);
         context.emit("done");
         return { handled: true };
@@ -30785,6 +30803,130 @@ Check for:
 If there are staged changes, review those. Otherwise, ask what to review.`
     };
   }
+  feedbackCommand() {
+    return {
+      name: "feedback",
+      description: "Submit feedback or report an issue on GitHub",
+      builtin: true,
+      selfHandled: true,
+      content: "",
+      handler: async (args, context) => {
+        const feedbackType = args.trim().toLowerCase();
+        const systemInfo = {
+          version: VERSION,
+          platform: platform2(),
+          release: release(),
+          arch: arch(),
+          nodeVersion: process.version,
+          bunVersion: typeof Bun !== "undefined" ? Bun.version : "N/A"
+        };
+        const repoUrl = "https://github.com/hasna/oldpal";
+        const issueBody = `## Description
+
+<!-- Describe the issue or feedback here -->
+
+## Steps to Reproduce (if bug)
+
+1.
+2.
+3.
+
+## Expected Behavior
+
+<!-- What did you expect to happen? -->
+
+## Actual Behavior
+
+<!-- What actually happened? -->
+
+## System Information
+
+- **oldpal version**: ${systemInfo.version}
+- **Platform**: ${systemInfo.platform} ${systemInfo.release} (${systemInfo.arch})
+- **Bun version**: ${systemInfo.bunVersion}
+- **Node version**: ${systemInfo.nodeVersion}
+
+## Additional Context
+
+<!-- Add any other context about the problem here -->
+`;
+        let issueTitle = "";
+        let labels = "";
+        if (feedbackType === "bug" || feedbackType === "issue") {
+          issueTitle = "[Bug] ";
+          labels = "bug";
+        } else if (feedbackType === "feature" || feedbackType === "request") {
+          issueTitle = "[Feature Request] ";
+          labels = "enhancement";
+        } else {
+          issueTitle = "[Feedback] ";
+          labels = "feedback";
+        }
+        const issueUrl = new URL(`${repoUrl}/issues/new`);
+        issueUrl.searchParams.set("title", issueTitle);
+        issueUrl.searchParams.set("body", issueBody);
+        if (labels) {
+          issueUrl.searchParams.set("labels", labels);
+        }
+        let finalUrl = issueUrl.toString();
+        if (finalUrl.length > 8000) {
+          const shortBody = `## Description
+
+<!-- Describe the issue or feedback here -->
+
+## System Information
+
+- **oldpal version**: ${systemInfo.version}
+- **Platform**: ${systemInfo.platform} (${systemInfo.arch})
+- **Bun version**: ${systemInfo.bunVersion}
+`;
+          const shortUrl = new URL(`${repoUrl}/issues/new`);
+          shortUrl.searchParams.set("title", issueTitle);
+          shortUrl.searchParams.set("body", shortBody);
+          if (labels) {
+            shortUrl.searchParams.set("labels", labels);
+          }
+          finalUrl = shortUrl.toString();
+        }
+        try {
+          const openCmd = platform2() === "darwin" ? "open" : platform2() === "win32" ? "start" : "xdg-open";
+          await Bun.$`${openCmd} ${finalUrl}`.quiet();
+          let message = `
+**Opening GitHub to submit feedback...**
+
+`;
+          message += `A browser window should open with a pre-filled issue template.
+`;
+          message += `Please fill in the details and submit.
+
+`;
+          message += `If the browser doesn't open, visit:
+${repoUrl}/issues/new
+`;
+          context.emit("text", message);
+        } catch {
+          let message = `
+**Submit Feedback**
+
+`;
+          message += `Please visit: ${repoUrl}/issues/new
+
+`;
+          message += `**System Information:**
+`;
+          message += `- oldpal version: ${systemInfo.version}
+`;
+          message += `- Platform: ${systemInfo.platform} ${systemInfo.release}
+`;
+          message += `- Bun version: ${systemInfo.bunVersion}
+`;
+          context.emit("text", message);
+        }
+        context.emit("done");
+        return { handled: true };
+      }
+    };
+  }
 }
 // packages/core/src/llm/client.ts
 async function createLLMClient(config) {
@@ -30964,6 +31106,7 @@ class AgentLoop {
   sessionId;
   isRunning = false;
   shouldStop = false;
+  systemPrompt = null;
   onChunk;
   onToolStart;
   onToolEnd;
@@ -31010,6 +31153,7 @@ class AgentLoop {
     this.builtinCommands.registerAll(this.commandLoader);
     this.hookLoader.load(hooksConfig);
     if (systemPrompt) {
+      this.systemPrompt = systemPrompt;
       this.context.addSystemMessage(systemPrompt);
     }
     await this.hookExecutor.execute(this.hookLoader.getHooks("SessionStart"), {
@@ -31043,6 +31187,9 @@ class AgentLoop {
         if (commandResult.handled) {
           if (commandResult.clearConversation) {
             this.context = new AgentContext;
+            if (this.systemPrompt) {
+              this.context.addSystemMessage(this.systemPrompt);
+            }
           }
           if (commandResult.exit) {
             this.emit({ type: "exit" });
@@ -31081,6 +31228,8 @@ class AgentLoop {
           responseText += chunk.content;
         } else if (chunk.type === "tool_use" && chunk.toolCall) {
           toolCalls.push(chunk.toolCall);
+        } else if (chunk.type === "usage" && chunk.usage) {
+          this.updateTokenUsage(chunk.usage);
         } else if (chunk.type === "error") {
           return;
         }
@@ -31103,13 +31252,13 @@ class AgentLoop {
     const results = [];
     for (const toolCall of toolCalls) {
       const preHookResult = await this.hookExecutor.execute(this.hookLoader.getHooks("PreToolUse"), {
-        session_id: generateId(),
+        session_id: this.sessionId,
         hook_event_name: "PreToolUse",
         cwd: this.cwd,
         tool_name: toolCall.name,
         tool_input: toolCall.input
       });
-      if (preHookResult?.permissionDecision === "deny") {
+      if (preHookResult?.continue === false || preHookResult?.permissionDecision === "deny") {
         results.push({
           toolCallId: toolCall.id,
           content: `Tool call denied: ${preHookResult.stopReason || "Blocked by hook"}`,
@@ -31121,9 +31270,10 @@ class AgentLoop {
       const result = await this.toolRegistry.execute(toolCall);
       this.onToolEnd?.(toolCall, result);
       this.emit({ type: "tool_result", toolResult: result });
-      await this.hookExecutor.execute(this.hookLoader.getHooks("PostToolUse"), {
-        session_id: generateId(),
-        hook_event_name: "PostToolUse",
+      const hookEvent = result.isError ? "PostToolUseFailure" : "PostToolUse";
+      await this.hookExecutor.execute(this.hookLoader.getHooks(hookEvent), {
+        session_id: this.sessionId,
+        hook_event_name: hookEvent,
         cwd: this.cwd,
         tool_name: toolCall.name,
         tool_input: toolCall.input,
@@ -31139,6 +31289,11 @@ class AgentLoop {
       sessionId: this.sessionId,
       messages: this.context.getMessages(),
       tools: this.toolRegistry.getTools(),
+      skills: this.skillLoader.getSkills().map((s) => ({
+        name: s.name,
+        description: s.description || "",
+        argumentHint: s.argumentHint
+      })),
       clearMessages: () => {
         this.context = new AgentContext;
       },
@@ -31213,7 +31368,7 @@ class AgentLoop {
 init_anthropic();
 
 // packages/core/src/logger.ts
-import { existsSync as existsSync6, mkdirSync as mkdirSync2, appendFileSync } from "fs";
+import { existsSync as existsSync6, mkdirSync as mkdirSync2, appendFileSync, readdirSync as readdirSync2, readFileSync as readFileSync3 } from "fs";
 import { join as join9 } from "path";
 import { homedir as homedir9 } from "os";
 
@@ -31286,6 +31441,55 @@ class SessionStorage {
   getSessionId() {
     return this.sessionId;
   }
+  load() {
+    try {
+      if (!existsSync6(this.sessionFile))
+        return null;
+      const content = Bun.file(this.sessionFile).text();
+      return JSON.parse(content);
+    } catch {
+      return null;
+    }
+  }
+  static listSessions() {
+    const sessionsDir = join9(homedir9(), ".oldpal", "sessions");
+    if (!existsSync6(sessionsDir))
+      return [];
+    const sessions = [];
+    const files = readdirSync2(sessionsDir);
+    for (const file of files) {
+      if (!file.endsWith(".json"))
+        continue;
+      try {
+        const filePath = join9(sessionsDir, file);
+        const stat = Bun.file(filePath);
+        const content = JSON.parse(readFileSync3(filePath, "utf-8"));
+        sessions.push({
+          id: file.replace(".json", ""),
+          cwd: content.cwd,
+          startedAt: content.startedAt,
+          updatedAt: content.updatedAt,
+          messageCount: content.messages?.length || 0
+        });
+      } catch {}
+    }
+    return sessions.sort((a, b) => new Date(b.updatedAt).getTime() - new Date(a.updatedAt).getTime());
+  }
+  static getLatestSession() {
+    const sessions = SessionStorage.listSessions();
+    return sessions[0] || null;
+  }
+  static loadSession(sessionId) {
+    const sessionsDir = join9(homedir9(), ".oldpal", "sessions");
+    const sessionFile = join9(sessionsDir, `${sessionId}.json`);
+    try {
+      if (!existsSync6(sessionFile))
+        return null;
+      return JSON.parse(readFileSync3(sessionFile, "utf-8"));
+    } catch {
+      return null;
+    }
+  }
 }
 function initOldpalDir() {
   const baseDir = join9(homedir9(), ".oldpal");
@@ -31330,12 +31534,6 @@ class EmbeddedClient {
       },
       onToolStart: (toolCall) => {
         this.logger.info("Tool started", { tool: toolCall.name, input: toolCall.input });
-        for (const callback of this.chunkCallbacks) {
-          callback({
-            type: "tool_use",
-            toolCall
-          });
-        }
       },
       onToolEnd: (toolCall, result) => {
         this.logger.info("Tool completed", {
@@ -31708,9 +31906,10 @@ var COMMANDS = [
   { name: "/bug", description: "analyze and fix a bug" },
   { name: "/pr", description: "create a pull request" },
   { name: "/review", description: "review code changes" },
+  { name: "/feedback", description: "submit feedback on GitHub" },
   { name: "/exit", description: "exit oldpal" }
 ];
-function Input({ onSubmit, isProcessing, queueLength = 0, commands }) {
+function Input({ onSubmit, isProcessing, queueLength = 0, commands, skills = [] }) {
   const [value, setValue] = import_react23.useState("");
   const [selectedIndex, setSelectedIndex] = import_react23.useState(0);
   const allCommands = import_react23.useMemo(() => {
@@ -31724,23 +31923,42 @@ function Input({ onSubmit, isProcessing, queueLength = 0, commands }) {
     }
     return merged.sort((a, b) => a.name.localeCompare(b.name));
   }, [commands]);
-  const showAutocomplete = value.startsWith("/") && !value.includes(" ");
+  const autocompleteMode = import_react23.useMemo(() => {
+    if (value.startsWith("$") && !value.includes(" ")) {
+      return "skill";
+    }
+    if (value.startsWith("/") && !value.includes(" ")) {
+      return "command";
+    }
+    return null;
+  }, [value]);
   const filteredCommands = import_react23.useMemo(() => {
-    if (!showAutocomplete)
+    if (autocompleteMode !== "command")
       return [];
     const search = value.toLowerCase();
     return allCommands.filter((cmd) => cmd.name.toLowerCase().startsWith(search));
-  }, [value, showAutocomplete, allCommands]);
+  }, [value, autocompleteMode, allCommands]);
+  const filteredSkills = import_react23.useMemo(() => {
+    if (autocompleteMode !== "skill")
+      return [];
+    const search = value.slice(1).toLowerCase();
+    return skills.filter((skill) => skill.name.toLowerCase().startsWith(search));
+  }, [value, autocompleteMode, skills]);
+  const autocompleteItems = autocompleteMode === "skill" ? filteredSkills : filteredCommands;
   use_input_default((input, key) => {
-    if (key.tab && showAutocomplete && filteredCommands.length > 0) {
-      const selected = filteredCommands[selectedIndex] || filteredCommands[0];
-      setValue(selected.name + " ");
+    if (key.tab && autocompleteItems.length > 0) {
+      const selected = autocompleteItems[selectedIndex] || autocompleteItems[0];
+      if (autocompleteMode === "skill") {
+        setValue("$" + selected.name + " ");
+      } else {
+        setValue(selected.name + " ");
+      }
       setSelectedIndex(0);
       return;
     }
-    if (showAutocomplete && filteredCommands.length > 0) {
+    if (autocompleteItems.length > 0) {
       if (key.downArrow) {
-        setSelectedIndex((prev) => Math.min(prev + 1, filteredCommands.length - 1));
+        setSelectedIndex((prev) => Math.min(prev + 1, autocompleteItems.length - 1));
         return;
       }
       if (key.upArrow) {
@@ -31781,37 +31999,29 @@ function Input({ onSubmit, isProcessing, queueLength = 0, commands }) {
     prompt = "\u22EF";
     placeholder = queueLength > 0 ? "Type to queue another..." : "Type to queue (Enter) or interrupt (Shift+Enter)...";
   }
+  const truncateDescription = (desc, maxLen = 60) => {
+    if (desc.length <= maxLen)
+      return desc;
+    return desc.slice(0, maxLen - 3) + "...";
+  };
+  const maxVisible = 8;
+  const getVisibleItems = (items) => {
+    if (items.length <= maxVisible) {
+      return { items, startIndex: 0 };
+    }
+    let startIndex = Math.max(0, selectedIndex - Math.floor(maxVisible / 2));
+    startIndex = Math.min(startIndex, items.length - maxVisible);
+    return {
+      items: items.slice(startIndex, startIndex + maxVisible),
+      startIndex
+    };
+  };
+  const visibleSkills = getVisibleItems(filteredSkills);
+  const visibleCommands = getVisibleItems(filteredCommands);
   return /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
     flexDirection: "column",
     marginTop: 1,
     children: [
-      showAutocomplete && filteredCommands.length > 0 && /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
-        flexDirection: "column",
-        marginBottom: 1,
-        marginLeft: 2,
-        children: [
-          filteredCommands.slice(0, 8).map((cmd, i) => /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
-            children: [
-              /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
-                color: i === selectedIndex ? "cyan" : undefined,
-                children: cmd.name.padEnd(16)
-              }, undefined, false, undefined, this),
-              /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
-                dimColor: i !== selectedIndex,
-                children: cmd.description
-              }, undefined, false, undefined, this)
-            ]
-          }, cmd.name, true, undefined, this)),
-          filteredCommands.length > 8 && /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
-            dimColor: true,
-            children: [
-              "  ...and ",
-              filteredCommands.length - 8,
-              " more"
-            ]
-          }, undefined, true, undefined, this)
-        ]
-      }, undefined, true, undefined, this),
       /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
         children: [
           /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
@@ -31828,6 +32038,88 @@ function Input({ onSubmit, isProcessing, queueLength = 0, commands }) {
             placeholder
           }, undefined, false, undefined, this)
         ]
+      }, undefined, true, undefined, this),
+      autocompleteMode === "skill" && filteredSkills.length > 0 && /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
+        flexDirection: "column",
+        marginTop: 1,
+        marginLeft: 2,
+        children: [
+          visibleSkills.startIndex > 0 && /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
+            dimColor: true,
+            children: [
+              "  \u2191 ",
+              visibleSkills.startIndex,
+              " more above"
+            ]
+          }, undefined, true, undefined, this),
+          visibleSkills.items.map((skill, i) => {
+            const actualIndex = visibleSkills.startIndex + i;
+            return /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
+              children: [
+                /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
+                  color: actualIndex === selectedIndex ? "cyan" : "#5fb3a1",
+                  children: [
+                    actualIndex === selectedIndex ? "\u25B8 " : "  ",
+                    skill.name.padEnd(18)
+                  ]
+                }, undefined, true, undefined, this),
+                /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
+                  dimColor: actualIndex !== selectedIndex,
+                  children: truncateDescription(skill.description)
+                }, undefined, false, undefined, this)
+              ]
+            }, skill.name, true, undefined, this);
+          }),
+          visibleSkills.startIndex + maxVisible < filteredSkills.length && /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
+            dimColor: true,
+            children: [
+              "  \u2193 ",
+              filteredSkills.length - visibleSkills.startIndex - maxVisible,
+              " more below"
+            ]
+          }, undefined, true, undefined, this)
+        ]
+      }, undefined, true, undefined, this),
+      autocompleteMode === "command" && filteredCommands.length > 0 && /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
+        flexDirection: "column",
+        marginTop: 1,
+        marginLeft: 2,
+        children: [
+          visibleCommands.startIndex > 0 && /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
+            dimColor: true,
+            children: [
+              "  \u2191 ",
+              visibleCommands.startIndex,
+              " more above"
+            ]
+          }, undefined, true, undefined, this),
+          visibleCommands.items.map((cmd, i) => {
+            const actualIndex = visibleCommands.startIndex + i;
+            return /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Box_default, {
+              children: [
+                /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
+                  color: actualIndex === selectedIndex ? "cyan" : undefined,
+                  children: [
+                    actualIndex === selectedIndex ? "\u25B8 " : "  ",
+                    cmd.name.padEnd(14)
+                  ]
+                }, undefined, true, undefined, this),
+                /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
+                  dimColor: actualIndex !== selectedIndex,
+                  children: cmd.description
+                }, undefined, false, undefined, this)
+              ]
+            }, cmd.name, true, undefined, this);
+          }),
+          visibleCommands.startIndex + maxVisible < filteredCommands.length && /* @__PURE__ */ jsx_dev_runtime.jsxDEV(Text, {
+            dimColor: true,
+            children: [
+              "  \u2193 ",
+              filteredCommands.length - visibleCommands.startIndex - maxVisible,
+              " more below"
+            ]
+          }, undefined, true, undefined, this)
+        ]
       }, undefined, true, undefined, this)
     ]
   }, undefined, true, undefined, this);
@@ -32450,6 +32742,10 @@ function SessionSelector({
 }) {
   const [selectedIndex, setSelectedIndex] = import_react26.useState(0);
   use_input_default((input, key) => {
+    if (input === "n" || input === "N") {
+      onNew();
+      return;
+    }
     if (key.escape) {
       onCancel();
       return;
@@ -32464,16 +32760,16 @@ function SessionSelector({
     }
     if (key.upArrow) {
       setSelectedIndex((prev) => Math.max(0, prev - 1));
+      return;
     }
     if (key.downArrow) {
       setSelectedIndex((prev) => Math.min(sessions.length, prev + 1));
+      return;
     }
     const num = parseInt(input, 10);
     if (!isNaN(num) && num >= 1 && num <= sessions.length) {
       onSelect(sessions[num - 1].id);
-    }
-    if (input === "n") {
-      onNew();
+      return;
     }
   });
   return /* @__PURE__ */ jsx_dev_runtime8.jsxDEV(Box_default, {
@@ -32581,6 +32877,7 @@ function App2({ cwd: cwd2 }) {
   const [currentTurnTokens, setCurrentTurnTokens] = import_react27.useState(0);
   const [scrollOffset, setScrollOffset] = import_react27.useState(0);
   const [autoScroll, setAutoScroll] = import_react27.useState(true);
+  const [skills, setSkills] = import_react27.useState([]);
   const responseRef = import_react27.useRef("");
   const toolCallsRef = import_react27.useRef([]);
   const toolResultsRef = import_react27.useRef([]);
@@ -32726,6 +33023,12 @@ function App2({ cwd: cwd2 }) {
         });
         const session = await registry2.createSession(cwd2);
         setActiveSessionId(session.id);
+        const loadedSkills = await session.client.getSkills();
+        setSkills(loadedSkills.map((s) => ({
+          name: s.name,
+          description: s.description || "",
+          argumentHint: s.argumentHint
+        })));
         setIsInitializing(false);
       } catch (err) {
         setError(err instanceof Error ? err.message : String(err));
@@ -32783,33 +33086,33 @@ function App2({ cwd: cwd2 }) {
   const sessionCount = registry2.getSessionCount();
   const backgroundProcessingCount = registry2.getBackgroundProcessingSessions().length;
   const handleSessionSwitch = import_react27.useCallback(async (sessionId) => {
+    setShowSessionSelector(false);
     if (sessionId === activeSessionId) {
-      setShowSessionSelector(false);
       return;
     }
     saveCurrentSessionState();
-    await registry2.switchSession(sessionId);
-    setActiveSessionId(sessionId);
     loadSessionState(sessionId);
     const session = registry2.getSession(sessionId);
     if (session) {
       setIsProcessing(session.isProcessing);
     }
-    setShowSessionSelector(false);
+    await registry2.switchSession(sessionId);
+    setActiveSessionId(sessionId);
   }, [activeSessionId, registry2, saveCurrentSessionState, loadSessionState]);
   const handleNewSession = import_react27.useCallback(async () => {
-    saveCurrentSessionState();
-    const newSession = await registry2.createSession(cwd2);
-    await registry2.switchSession(newSession.id);
-    setActiveSessionId(newSession.id);
-    loadSessionState(newSession.id);
-    setIsProcessing(false);
     setShowSessionSelector(false);
+    try {
+      saveCurrentSessionState();
+      const newSession = await registry2.createSession(cwd2);
+      loadSessionState(newSession.id);
+      setIsProcessing(false);
+      await registry2.switchSession(newSession.id);
+      setActiveSessionId(newSession.id);
+    } catch (err) {
+      setError(err instanceof Error ? err.message : "Failed to create session");
+    }
   }, [cwd2, registry2, saveCurrentSessionState, loadSessionState]);
   use_input_default((input, key) => {
-    if (showSessionSelector) {
-      return;
-    }
     if (key.ctrl && input === "s") {
       if (sessions.length > 0) {
         setShowSessionSelector(true);
@@ -32887,11 +33190,15 @@ function App2({ cwd: cwd2 }) {
       setScrollOffset(0);
       setAutoScroll(true);
     }
-  });
+  }, { isActive: !showSessionSelector });
   const handleSubmit = import_react27.useCallback(async (input, mode = "normal") => {
     if (!activeSession || !input.trim())
       return;
     const trimmedInput = input.trim();
+    if (trimmedInput.startsWith("$")) {
+      const skillInput = "/" + trimmedInput.slice(1);
+      return handleSubmit(skillInput, mode);
+    }
     if (trimmedInput.startsWith("/session")) {
       const arg = trimmedInput.slice(8).trim();
       if (arg === "new") {
@@ -32984,7 +33291,7 @@ function App2({ cwd: cwd2 }) {
     padding: 1,
     children: [
       showWelcome && /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(WelcomeBanner, {
-        version: "0.5.3",
+        version: "0.6.0",
         model: "claude-sonnet-4",
         directory: activeSession?.cwd || cwd2
       }, undefined, false, undefined, this),
@@ -33018,7 +33325,7 @@ function App2({ cwd: cwd2 }) {
         activityLog: isProcessing ? activityLog.filter((e) => e.type === "text") : [],
         scrollOffset,
         maxVisible: maxVisibleMessages
-      }, undefined, false, undefined, this),
+      }, activeSessionId || "default", false, undefined, this),
       isProcessing && toolCallEntries.length > 0 && /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Box_default, {
         marginY: 1,
         children: /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Text, {
@@ -33065,7 +33372,8 @@ function App2({ cwd: cwd2 }) {
       /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Input, {
         onSubmit: handleSubmit,
         isProcessing,
-        queueLength: messageQueue.length
+        queueLength: messageQueue.length,
+        skills
       }, undefined, false, undefined, this),
       /* @__PURE__ */ jsx_dev_runtime9.jsxDEV(Status, {
         isProcessing,
@@ -33080,16 +33388,212 @@ function App2({ cwd: cwd2 }) {
   }, undefined, true, undefined, this);
 }
 
+// packages/terminal/src/headless.ts
+async function runHeadless(options) {
+  const {
+    prompt,
+    cwd: cwd2,
+    outputFormat,
+    jsonSchema
+  } = options;
+  const client = new EmbeddedClient(cwd2);
+  let result = "";
+  const toolCalls = [];
+  let hadError = false;
+  let errorMessage = "";
+  client.onChunk((chunk) => {
+    if (outputFormat === "stream-json") {
+      const event = formatStreamEvent(chunk);
+      if (event) {
+        process.stdout.write(JSON.stringify(event) + `
+`);
+      }
+    }
+    if (chunk.type === "text" && chunk.content) {
+      result += chunk.content;
+      if (outputFormat === "text") {
+        process.stdout.write(chunk.content);
+      }
+    }
+    if (chunk.type === "tool_use" && chunk.toolCall) {
+      toolCalls.push({
+        name: chunk.toolCall.name,
+        input: chunk.toolCall.input
+      });
+    }
+    if (chunk.type === "error" && chunk.error) {
+      hadError = true;
+      errorMessage = chunk.error;
+    }
+  });
+  client.onError((error) => {
+    hadError = true;
+    errorMessage = error.message;
+    if (outputFormat === "json") {
+      console.error(JSON.stringify({ error: error.message }));
+    } else {
+      console.error(`Error: ${error.message}`);
+    }
+  });
+  await client.initialize();
+  let message = prompt;
+  if (jsonSchema) {
+    message = `${prompt}
+
+IMPORTANT: Your response MUST be valid JSON conforming to this schema:
+${jsonSchema}`;
+  }
+  await client.send(message);
+  if (outputFormat === "json") {
+    const output = {
+      result: result.trim(),
+      session_id: client.getSessionId(),
+      usage: client.getTokenUsage(),
+      tool_calls: toolCalls.length > 0 ? toolCalls : undefined
+    };
+    if (jsonSchema) {
+      try {
+        output.structured_output = JSON.parse(result.trim());
+      } catch {}
+    }
+    console.log(JSON.stringify(output, null, 2));
+  } else if (outputFormat === "text") {
+    if (result && !result.endsWith(`
+`)) {
+      process.stdout.write(`
+`);
+    }
+  }
+  client.disconnect();
+  if (hadError) {
+    process.exit(1);
+  }
+}
+function formatStreamEvent(chunk) {
+  const timestamp = Date.now();
+  switch (chunk.type) {
+    case "text":
+      return {
+        type: "text_delta",
+        text: chunk.content,
+        timestamp
+      };
+    case "tool_use":
+      return {
+        type: "tool_use",
+        tool_call: {
+          id: chunk.toolCall?.id,
+          name: chunk.toolCall?.name,
+          input: chunk.toolCall?.input
+        },
+        timestamp
+      };
+    case "tool_result":
+      return {
+        type: "tool_result",
+        tool_result: {
+          tool_call_id: chunk.toolResult?.toolCallId,
+          content: chunk.toolResult?.content,
+          is_error: chunk.toolResult?.isError
+        },
+        timestamp
+      };
+    case "usage":
+      return {
+        type: "usage",
+        usage: chunk.usage,
+        timestamp
+      };
+    case "error":
+      return {
+        type: "error",
+        error: chunk.error,
+        timestamp
+      };
+    case "done":
+      return {
+        type: "done",
+        timestamp
+      };
+    default:
+      return null;
+  }
+}
+
 // packages/terminal/src/index.tsx
 var jsx_dev_runtime10 = __toESM(require_jsx_dev_runtime(), 1);
-var args = process.argv.slice(2);
-var options = {
-  cwd: process.cwd(),
-  version: args.includes("--version") || args.includes("-v"),
-  help: args.includes("--help") || args.includes("-h")
-};
+var VERSION3 = "0.6.2";
+function parseArgs(argv) {
+  const args = argv.slice(2);
+  const options = {
+    cwd: process.cwd(),
+    version: false,
+    help: false,
+    print: null,
+    outputFormat: "text",
+    allowedTools: [],
+    systemPrompt: null,
+    jsonSchema: null,
+    continue: false,
+    resume: null
+  };
+  for (let i = 0;i < args.length; i++) {
+    const arg = args[i];
+    if (arg === "--version" || arg === "-v") {
+      options.version = true;
+      continue;
+    }
+    if (arg === "--help" || arg === "-h") {
+      options.help = true;
+      continue;
+    }
+    if (arg === "--print" || arg === "-p") {
+      options.print = args[++i] || "";
+      continue;
+    }
+    if (arg === "--output-format") {
+      const format = args[++i];
+      if (format === "text" || format === "json" || format === "stream-json") {
+        options.outputFormat = format;
+      }
+      continue;
+    }
+    if (arg === "--allowed-tools" || arg === "--allowedTools") {
+      const tools = args[++i];
+      if (tools) {
+        options.allowedTools = tools.split(",").map((t) => t.trim());
+      }
+      continue;
+    }
+    if (arg === "--system-prompt") {
+      options.systemPrompt = args[++i] || null;
+      continue;
+    }
+    if (arg === "--json-schema") {
+      options.jsonSchema = args[++i] || null;
+      continue;
+    }
+    if (arg === "--continue" || arg === "-c") {
+      options.continue = true;
+      continue;
+    }
+    if (arg === "--resume" || arg === "-r") {
+      options.resume = args[++i] || null;
+      continue;
+    }
+    if (arg === "--cwd") {
+      options.cwd = args[++i] || process.cwd();
+      continue;
+    }
+    if (options.print === "" && !arg.startsWith("-")) {
+      options.print = arg;
+    }
+  }
+  return options;
+}
+var options = parseArgs(process.argv);
 if (options.version) {
-  console.log("oldpal v0.5.3");
+  console.log(`oldpal v${VERSION3}`);
   process.exit(0);
 }
 if (options.help) {
@@ -33097,27 +33601,74 @@ if (options.help) {
 oldpal - Your personal AI assistant
 
 Usage:
-  oldpal [options]
+  oldpal [options]                    Start interactive mode
+  oldpal -p "<prompt>" [options]      Run in headless mode
 
 Options:
-  -h, --help     Show this help message
-  -v, --version  Show version number
+  -h, --help                   Show this help message
+  -v, --version                Show version number
+
+Headless Mode:
+  -p, --print <prompt>         Run non-interactively with the given prompt
+  --output-format <format>     Output format: text (default), json, stream-json
+  --allowed-tools <tools>      Comma-separated tools to auto-approve (e.g., "Read,Edit,Bash")
+  --system-prompt <prompt>     Custom system prompt
+  --json-schema <schema>       JSON Schema for structured output (use with --output-format json)
+  -c, --continue               Continue the most recent conversation
+  -r, --resume <session_id>    Resume a specific session by ID
+  --cwd <path>                 Set working directory
+
+Examples:
+  # Ask a question
+  oldpal -p "What does the auth module do?"
+
+  # Run with JSON output
+  oldpal -p "Summarize this project" --output-format json
 
-Commands:
-  (none)         Start interactive mode
+  # Stream JSON events
+  oldpal -p "Explain this code" --output-format stream-json
 
-In interactive mode:
+  # Auto-approve tools
+  oldpal -p "Fix the bug in auth.py" --allowed-tools "Read,Edit,Bash"
+
+  # Get structured output
+  oldpal -p "List all functions" --output-format json --json-schema '{"type":"array","items":{"type":"string"}}'
+
+  # Continue conversation
+  oldpal -p "What else can you tell me?" --continue
+
+Interactive Mode:
   - Type your message and press Enter to send
-  - Use /skill-name to invoke a skill
+  - Use $skill-name to invoke a skill
+  - Use /command for built-in commands
+  - Press Ctrl+S to switch sessions
   - Press Ctrl+C to exit
 `);
   process.exit(0);
 }
-var { waitUntilExit } = render_default(/* @__PURE__ */ jsx_dev_runtime10.jsxDEV(App2, {
-  cwd: options.cwd
-}, undefined, false, undefined, this));
-waitUntilExit().then(() => {
-  process.exit(0);
-});
+if (options.print !== null) {
+  if (!options.print.trim()) {
+    console.error("Error: Prompt is required with -p/--print flag");
+    process.exit(1);
+  }
+  runHeadless({
+    prompt: options.print,
+    cwd: options.cwd,
+    outputFormat: options.outputFormat,
+    allowedTools: options.allowedTools.length > 0 ? options.allowedTools : undefined,
+    systemPrompt: options.systemPrompt || undefined,
+    jsonSchema: options.jsonSchema || undefined
+  }).catch((error) => {
+    console.error("Error:", error.message);
+    process.exit(1);
+  });
+} else {
+  const { waitUntilExit } = render_default(/* @__PURE__ */ jsx_dev_runtime10.jsxDEV(App2, {
+    cwd: options.cwd
+  }, undefined, false, undefined, this));
+  waitUntilExit().then(() => {
+    process.exit(0);
+  });
+}
 
-//# debugId=F56E791D31BE043564756E2164756E21
+//# debugId=34BD21624905F2E764756E2164756E21