junecoder 1.0.10 → 1.0.12

package/agent.mjs

@@ -263,7 +263,7 @@ function defaultCallbacks(overrides = {}) {
     onToolCall: () => {},
     onToolResult: () => {},
     onToolOutput: () => {},
-    onPermissionRequest: async () => true,
+    onPermissionRequest: async () => ({ allowed: true }),
     onCompress: () => {},
     onUsage: () => {},
     onTurnEnd: () => {},

package/executor.mjs

@@ -66,10 +66,16 @@ export async function executeToolCalls(agent, toolByName, toolCalls, callbacks,
 
     // Permission request for non-readonly tools
     let permissionDenied = false;
+    let denyReason = '';
     if (!tool.readonly && cb.onPermissionRequest) {
       try {
-        const allowed = await cb.onPermissionRequest(tool, args);
-        if (!allowed) {
+        const result = await cb.onPermissionRequest(tool, args);
+        if (typeof result === 'object' && result !== null) {
+          if (!result.allowed) {
+            permissionDenied = true;
+            denyReason = result.reason || '';
+          }
+        } else if (!result) {
           permissionDenied = true;
         }
       } catch {
@@ -78,11 +84,12 @@ export async function executeToolCalls(agent, toolByName, toolCalls, callbacks,
     }
 
     if (permissionDenied) {
+      const reasonSuffix = denyReason ? ` Reason: ${denyReason}` : '';
       prepared.push({
         id,
         name,
         denied: true,
-        output: `Permission denied for "${name}".`,
+        output: `Permission denied for "${name}".${reasonSuffix}`,
       });
       continue;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "junecoder",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "description": "Zero Npm Dependencies Agent Framework",
   "main": "agent.mjs",
   "type": "module",

package/tui.mjs

@@ -227,8 +227,10 @@ export async function startTUI(agent, opts = {}) {
 
     let borderColor = C.tool, title;
     if (state.question) { borderColor = C.tool; title = " " + sliceByWidth(state.question.text, W - 6) + " "; }
+    else if (state.permission?.reasonMode) { borderColor = C.warn; title = " Denied \u2014 why? (Enter to send, Esc to skip) "; }
     else if (state.permission) { borderColor = C.warn; title = state.permission.name === "continue" ? " Continue? (y/n) " : " Allow " + state.permission.name + "? (y/n/a) "; }
     else if (state.processing) title = " Processing... ";
+    else if (setupMode) title = " API Key ";
     else title = " Input ";
     const topBorder = "\u256d\u2500" + title + "\u2500".repeat(Math.max(0, W - 3 - stringWidth(title))) + "\u256e";
     out.push(`${borderColor}${topBorder}${ansi.reset}${ansi.clearLine}`);
@@ -271,9 +273,16 @@ export async function startTUI(agent, opts = {}) {
   keyStream.on("keypress", (str, key) => {
     if (state.permission) {
       const ch = (str || key.name || "").toLowerCase();
-      if (ch === "y" || key.name === "y") state.permission.resolve(true);
-      else if (ch === "n" || key.name === "n") state.permission.resolve(false);
-      else if (ch === "a" || key.name === "a") { agent.autoApprove = true; state.permission.resolve(true); pushLine("  [auto] Auto-approve ON.", C.warn); }
+      if (ch === "y" || key.name === "y") state.permission.resolve({ allowed: true });
+      else if (ch === "a" || key.name === "a") { agent.autoApprove = true; state.permission.resolve({ allowed: true }); pushLine("  [auto] Auto-approve ON.", C.warn); }
+      else if (ch === "n" || key.name === "n") {
+        // Enter reason mode
+        state.permission.reasonMode = true;
+        state.input = []; state.cursor = 0;
+        state.status = "Denied — why? (Enter to send, Esc to skip)";
+        render();
+        return;
+      }
       else return;
       state.permission = null; state.permissionPreview = []; state.status = state.processing ? "Processing..." : "Ready"; render(); return;
     }
@@ -292,6 +301,14 @@ export async function startTUI(agent, opts = {}) {
       if (state.question.options.length === 0) { editInput(str, key); render(); return; }
       return;
     }
+    if (state.permission?.reasonMode && key.name === "escape") {
+      state.input = []; state.cursor = 0;
+      const resolve = state.permission.resolve;
+      state.permission = null; state.permissionPreview = [];
+      state.status = state.processing ? "Processing..." : "Ready";
+      resolve({ allowed: false });
+      render(); return;
+    }
     if (key.name === "c" && key.ctrl) {
       if (state.processing && state.controller) { state.controller.abort(); state.status = "Aborting..."; render(); }
       else { cleanup(); process.exit(0); }
@@ -338,20 +355,47 @@ export async function startTUI(agent, opts = {}) {
     pushLine("Before you start, you need a DeepSeek API key.", C.text);
     pushLine("Get one at: https://platform.deepseek.com/api_keys", C.dim);
     pushLine("", C.dim);
-    state.status = "Paste your DeepSeek API key and press Enter  (https://platform.deepseek.com/api_keys)";
+    state.status = "Paste your DeepSeek API key and press Enter";
   }
 
   async function submit() {
     const text = state.input.join("").trim();
-    if (!text || state.processing) return;
+    if (!text || (state.processing && !state.permission?.reasonMode)) return;
+
+    // ─── Permission reason mode ────────────────────────────────────────────
+    if (state.permission?.reasonMode) {
+      const reason = text;
+      state.input = []; state.cursor = 0;
+      const resolve = state.permission.resolve;
+      state.permission = null; state.permissionPreview = [];
+      state.status = state.processing ? "Processing..." : "Ready";
+      pushLine("  Denied: " + (reason || "(no reason)"), C.warn);
+      resolve({ allowed: false, reason: reason || undefined });
+      render(); return;
+    }
 
     // ─── Setup mode: first input is the API key ──────────────────────────────
     if (setupMode) {
-      setupMode = false;
       state.input = []; state.cursor = 0;
       const trimmed = text.trim();
 
+      // Allow slash commands to pass through during setup (e.g. /key cancel)
+      if (trimmed.startsWith("/")) {
+        setupMode = false;
+        await handleSlash(trimmed);
+        return;
+      }
+
+      // Empty input: exit on first-run, cancel on re-key
       if (!trimmed) {
+        if (agent.provider.apiKey) {
+          // Already have a key — user is just changing their mind
+          setupMode = false;
+          pushLine("Key unchanged.", C.dim);
+          state.status = "Ready";
+          render();
+          return;
+        }
         pushLine("No API key provided. Exiting.", C.error);
         render();
         await new Promise(r => setTimeout(r, 1500));
@@ -362,8 +406,8 @@ export async function startTUI(agent, opts = {}) {
       if (!trimmed.startsWith("sk-")) {
         pushLine("Invalid key — DeepSeek API keys must start with 'sk-'. Try again:", C.error);
         pushLine("", C.dim);
-        setupMode = true;  // stay in setup mode
-        state.status = "Paste your DeepSeek API key and press Enter  (https://platform.deepseek.com/api_keys)";
+        setupMode = true;
+        state.status = "Paste your DeepSeek API key and press Enter";
         render();
         return;
       }
@@ -376,6 +420,7 @@ export async function startTUI(agent, opts = {}) {
 
       pushLine("API key saved to ~/.junecoder/.env", C.tool);
       pushLine("", C.dim);
+      setupMode = false;
       state.status = "Ready";
       render();
       return;
@@ -406,7 +451,7 @@ export async function startTUI(agent, opts = {}) {
       try { await runAgent(agent, text, callbacks, { signal: state.controller.signal, resume }); flushStream(); break; }
       catch (error) { flushStream();
         if (error.name === "AbortError" || state.controller?.signal.aborted) { pushLine("[Aborted]", C.warn); break; }
-        if (error instanceof ContinueError) { pushLabel("\u276f Continue", ansi.bold + C.warn); pushLine("Ran " + error.turn + " turns (limit " + error.turn + "). Continue?", C.warn); const willContinue = await new Promise(resolve => { state.permission = { name: "continue", args: { turns: error.turn }, resolve }; state.status = "Continue after " + error.turn + " turns?"; render(); }); state.permission = null; if (!willContinue) { pushLine("[Cancelled]", C.warn); break; } pushLine("[Continuing\u2026]", C.tool); state.controller = new AbortController(); continue; }
+        if (error instanceof ContinueError) { pushLabel("\u276f Continue", ansi.bold + C.warn); pushLine("Ran " + error.turn + " turns (limit " + error.turn + "). Continue?", C.warn); const willContinue = await new Promise(resolve => { state.permission = { name: "continue", args: { turns: error.turn }, resolve, reasonMode: false }; state.status = "Continue after " + error.turn + " turns?"; render(); }); state.permission = null; state.permissionPreview = []; if (!willContinue.allowed) { pushLine("[Cancelled]", C.warn); break; } pushLine("[Continuing\u2026]", C.tool); state.controller = new AbortController(); continue; }
         pushLine("[error] " + error.message, C.error); break;
       }
     }
@@ -415,7 +460,7 @@ export async function startTUI(agent, opts = {}) {
     try { saveSession(agent, state.lines); } catch {} render();
   }
   function flushStream() { if (state.reasoning) { pushLine(state.reasoning, C.reason); state.reasoning = ""; } if (state.streaming) { pushLine(state.streaming, C.text); state.streaming = ""; } }
-  function askPermission(name, args) { if (agent.autoApprove) { pushLine("  [auto] " + name + " " + summarize(args), C.warn); return Promise.resolve(true); } state.permissionPreview = formatPermission(name, args); return new Promise(resolve => { state.permission = { name, args, resolve }; state.status = "Waiting: " + name; render(); }); }
+  function askPermission(name, args) { if (agent.autoApprove) { pushLine("  [auto] " + name + " " + summarize(args), C.warn); return Promise.resolve({ allowed: true }); } state.permissionPreview = formatPermission(name, args); return new Promise(resolve => { state.permission = { name, args, resolve, reasonMode: false }; state.status = "Waiting: " + name; render(); }); }
   function askQuestion(text) { if (state.question) return Promise.resolve("(already waiting)"); pushLabel("\u276f Question", ansi.bold + C.tool); for (const line of text.split("\n")) pushLine("  " + line, C.text); return new Promise(resolve => { state.question = { text, options: [], resolve }; state.status = "Waiting..."; render(); }); }
 
   async function handleSlash(text) {
@@ -427,9 +472,9 @@ export async function startTUI(agent, opts = {}) {
       case "model": pushLine("  Model: " + agent.provider.model + " | Provider: " + (agent.provider.type || "?"), C.dim); break;
       case "key": {
         pushLine("  Current key: " + (agent.provider.apiKey ? agent.provider.apiKey.slice(0, 8) + "..." : "(none)"), C.dim);
-        pushLine("  To change, paste your new API key and press Enter.", C.tool);
+        pushLine("  Paste a new key, /cmd to cancel, or Enter to keep current.", C.tool);
         setupMode = true;
-        state.status = "Paste your DeepSeek API key and press Enter  (https://platform.deepseek.com/api_keys)";
+        state.status = "Paste your DeepSeek API key and press Enter";
         break;
       }
       case "session": { const slots = listSlots(agent.cwd); pushLine("Sessions:", C.tool); if (slots.length === 0) pushLine("  (none)", C.dim); else for (const s of slots) pushLine("  " + s.label, C.dim); break; }
@@ -457,8 +502,8 @@ export async function startTUI(agent, opts = {}) {
           for (const c of candidates) {
             pushLine(`\n  [${c.type}] ${c.title}`, C.text);
             pushLine(`    ${c.content.slice(0, 200)}...`, C.dim);
-            const accept = await askPermission("distill-save", { title: c.title });
-            if (accept) {
+            const result = await askPermission("distill-save", { title: c.title });
+            if (result.allowed) {
               const status = await saveCandidate(agent.memory, c, {});
               pushLine(`  ✓ ${status}`, C.tool);
               saved++;