juno-code 1.0.51 → 1.0.53

package/dist/index.mjs

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 import chalk from 'chalk';
+import * as childProcess from 'child_process';
 import { spawn } from 'child_process';
 import * as fs3 from 'fs';
 import { promises } from 'fs';
@@ -11,6 +12,7 @@ import { z } from 'zod';
 import * as yaml from 'js-yaml';
 import { EventEmitter } from 'events';
 import { execa } from 'execa';
+import { promisify } from 'util';
 import { v4 } from 'uuid';
 import * as process2 from 'process';
 
@@ -34,7 +36,7 @@ var __export = (target, all) => {
 var version;
 var init_version = __esm({
   "src/version.ts"() {
-    version = "1.0.51";
+    version = "1.0.53";
   }
 });
 
@@ -722,25 +724,28 @@ var init_shell_backend = __esm({
           const scriptPath = await this.findScriptForSubagent(subagentType);
           const result = await this.executeScript(scriptPath, request, toolId, subagentType);
           const duration = Date.now() - startTime;
+          const structuredResult = this.buildStructuredOutput(subagentType, result);
+          const structuredPayload = this.parseStructuredResultPayload(structuredResult.content);
+          const structuredIndicatesError = structuredPayload?.is_error === true || structuredPayload?.subtype === "error";
+          const executionSucceeded = result.success && !structuredIndicatesError;
           await this.emitProgressEvent({
             sessionId: request.metadata?.sessionId || "unknown",
             timestamp: /* @__PURE__ */ new Date(),
             backend: "shell",
             count: ++this.eventCounter,
             type: "tool_result" /* TOOL_RESULT */,
-            content: `${request.toolName} completed successfully (${duration}ms)`,
+            content: executionSucceeded ? `${request.toolName} completed successfully (${duration}ms)` : `${request.toolName} completed with error (${duration}ms)`,
             toolId,
             metadata: {
               toolName: request.toolName,
               duration,
-              success: result.success,
+              success: executionSucceeded,
               phase: "completion"
             }
           });
-          const structuredResult = this.buildStructuredOutput(subagentType, result);
           const toolResult = {
             content: structuredResult.content,
-            status: result.success ? "completed" /* COMPLETED */ : "failed" /* FAILED */,
+            status: executionSucceeded ? "completed" /* COMPLETED */ : "failed" /* FAILED */,
             startTime: new Date(startTime),
             endTime: /* @__PURE__ */ new Date(),
             duration,
@@ -749,6 +754,9 @@ var init_shell_backend = __esm({
           };
           if (result.error) {
             toolResult.error = new Error(result.error);
+          } else if (!executionSucceeded) {
+            const structuredErrorMessage = typeof structuredPayload?.error === "string" && structuredPayload.error || typeof structuredPayload?.result === "string" && structuredPayload.result || `${request.toolName} reported a structured error`;
+            toolResult.error = new Error(structuredErrorMessage);
           }
           if (structuredResult.metadata) {
             toolResult.metadata = structuredResult.metadata;
@@ -1000,6 +1008,9 @@ var init_shell_backend = __esm({
           if (isPython && subagentType === "pi" && request.arguments?.live === true) {
             args.push("--live");
           }
+          if (isPython && subagentType === "pi" && request.arguments?.liveInteractiveSession === true) {
+            args.push("--live-manual");
+          }
           if (isPython && this.config.debug) {
             args.push("--verbose");
           }
@@ -1282,8 +1293,19 @@ var init_shell_backend = __esm({
         if (subagentType === "pi") {
           const piEvent = result.subAgentResponse ?? this.extractLastJsonEvent(result.output);
           if (piEvent) {
-            let resultText = piEvent.result;
-            if (!resultText && Array.isArray(piEvent.messages)) {
+            const piNestedEvent = typeof piEvent.sub_agent_response === "object" && piEvent.sub_agent_response ? piEvent.sub_agent_response : void 0;
+            const piSessionId = typeof piEvent.session_id === "string" && piEvent.session_id ? piEvent.session_id : typeof piEvent.sessionId === "string" && piEvent.sessionId ? piEvent.sessionId : typeof piEvent.id === "string" && piEvent.type === "session" ? piEvent.id : typeof piNestedEvent?.session_id === "string" && piNestedEvent.session_id ? piNestedEvent.session_id : typeof piNestedEvent?.sessionId === "string" && piNestedEvent.sessionId ? piNestedEvent.sessionId : typeof piNestedEvent?.id === "string" && piNestedEvent.type === "session" ? piNestedEvent.id : typeof piEvent.sub_agent_response?.session_id === "string" && piEvent.sub_agent_response.session_id ? piEvent.sub_agent_response.session_id : void 0;
+            const sanitizedPiEvent = { ...piEvent };
+            delete sanitizedPiEvent.messages;
+            if (sanitizedPiEvent.sub_agent_response && typeof sanitizedPiEvent.sub_agent_response === "object") {
+              const inner = { ...sanitizedPiEvent.sub_agent_response };
+              delete inner.messages;
+              delete inner.type;
+              sanitizedPiEvent.sub_agent_response = inner;
+            }
+            const hasDirectResultText = typeof piEvent.result === "string";
+            let resultText = hasDirectResultText ? piEvent.result : void 0;
+            if (resultText === void 0 && Array.isArray(piEvent.messages)) {
               for (let i = piEvent.messages.length - 1; i >= 0; i--) {
                 const msg = piEvent.messages[i];
                 if (msg?.role === "assistant") {
@@ -1303,16 +1325,11 @@ var init_shell_backend = __esm({
                 }
               }
             }
-            if (resultText) {
+            if (resultText === void 0 && typeof piEvent.error === "string") {
+              resultText = piEvent.error;
+            }
+            if (resultText !== void 0) {
               const isError = piEvent.is_error ?? !result.success;
-              const sanitizedPiEvent = { ...piEvent };
-              delete sanitizedPiEvent.messages;
-              if (sanitizedPiEvent.sub_agent_response && typeof sanitizedPiEvent.sub_agent_response === "object") {
-                const inner = { ...sanitizedPiEvent.sub_agent_response };
-                delete inner.messages;
-                delete inner.type;
-                sanitizedPiEvent.sub_agent_response = inner;
-              }
               const usage = piEvent.usage;
               const totalCostUsd = typeof piEvent.total_cost_usd === "number" ? piEvent.total_cost_usd : typeof usage?.cost?.total === "number" ? usage.cost.total : void 0;
               const structuredPayload = {
@@ -1320,9 +1337,9 @@ var init_shell_backend = __esm({
                 subtype: piEvent.subtype || (isError ? "error" : "success"),
                 is_error: isError,
                 result: resultText,
-                error: piEvent.error,
+                error: isError ? piEvent.error ?? result.error ?? resultText : piEvent.error,
                 stderr: result.error,
-                session_id: piEvent.session_id,
+                session_id: piSessionId,
                 exit_code: result.exitCode,
                 duration_ms: piEvent.duration_ms ?? result.duration,
                 total_cost_usd: totalCostUsd,
@@ -1340,6 +1357,57 @@ var init_shell_backend = __esm({
                 metadata
               };
             }
+            const isSessionSnapshotOnly = piEvent.type === "session" || piEvent.subtype === "session";
+            if (isSessionSnapshotOnly) {
+              const errorMessage = result.error?.trim() || "Pi exited before emitting a terminal result event (session snapshot only).";
+              const structuredPayload = {
+                type: "result",
+                subtype: "error",
+                is_error: true,
+                result: errorMessage,
+                error: errorMessage,
+                stderr: result.error,
+                session_id: piSessionId,
+                exit_code: result.exitCode,
+                duration_ms: result.duration,
+                sub_agent_response: sanitizedPiEvent
+              };
+              const metadata = {
+                ...piEvent ? { subAgentResponse: piEvent } : void 0,
+                structuredOutput: true,
+                contentType: "application/json",
+                rawOutput: result.output
+              };
+              return {
+                content: JSON.stringify(structuredPayload),
+                metadata
+              };
+            }
+            if (!result.success) {
+              const errorMessage = result.error?.trim() || result.output?.trim() || "Unknown error";
+              const structuredPayload = {
+                type: "result",
+                subtype: "error",
+                is_error: true,
+                result: errorMessage,
+                error: errorMessage,
+                stderr: result.error,
+                session_id: piSessionId,
+                exit_code: result.exitCode,
+                duration_ms: result.duration,
+                sub_agent_response: sanitizedPiEvent
+              };
+              const metadata = {
+                ...piEvent ? { subAgentResponse: piEvent } : void 0,
+                structuredOutput: true,
+                contentType: "application/json",
+                rawOutput: result.output
+              };
+              return {
+                content: JSON.stringify(structuredPayload),
+                metadata
+              };
+            }
           }
         }
         if (!result.success) {
@@ -1404,6 +1472,20 @@ var init_shell_backend = __esm({
         }
         return null;
       }
+      /**
+       * Parse JSON structured output payload emitted by shell service wrappers.
+       */
+      parseStructuredResultPayload(content) {
+        try {
+          const parsed = JSON.parse(content);
+          if (!parsed || typeof parsed !== "object") {
+            return null;
+          }
+          return parsed;
+        } catch {
+          return null;
+        }
+      }
       /**
        * Extract the last valid JSON object from a script's stdout to use as a structured payload fallback.
        */
@@ -1726,6 +1808,31 @@ var SUBAGENT_DEFAULT_MODELS = {
   cursor: "auto",
   pi: ":pi"
 };
+function isModelCompatibleWithSubagent(model, subagent) {
+  if (!model.startsWith(":")) {
+    return true;
+  }
+  const claudeShorthands = [":sonnet", ":haiku", ":opus"];
+  const codexShorthands = [":codex", ":codex-mini", ":gpt-5", ":mini"];
+  const geminiShorthands = [":pro", ":flash"];
+  const isClaudeModel = claudeShorthands.includes(model) || model.startsWith(":claude");
+  const isCodexModel = codexShorthands.includes(model) || model.startsWith(":gpt");
+  const isGeminiModel = geminiShorthands.includes(model) || model.startsWith(":gemini");
+  switch (subagent) {
+    case "claude":
+      return isClaudeModel || !isCodexModel && !isGeminiModel;
+    case "codex":
+      return isCodexModel || !isClaudeModel && !isGeminiModel;
+    case "gemini":
+      return isGeminiModel || !isClaudeModel && !isCodexModel;
+    case "cursor":
+      return true;
+    case "pi":
+      return true;
+    default:
+      return true;
+  }
+}
 
 // src/core/config.ts
 var ENV_VAR_MAPPING = {
@@ -2249,6 +2356,13 @@ async function ensureHooksConfig(baseDir) {
         existingConfig.defaultModels = baseDefaults;
         needsUpdate = true;
       }
+      const selectedSubagentRaw = typeof existingConfig.defaultSubagent === "string" ? existingConfig.defaultSubagent : "claude";
+      const selectedSubagent = selectedSubagentRaw in SUBAGENT_DEFAULT_MODELS ? selectedSubagentRaw : "claude";
+      const selectedMapModel = existingConfig.defaultModels && typeof existingConfig.defaultModels === "object" ? existingConfig.defaultModels[selectedSubagent] : void 0;
+      if (typeof selectedMapModel === "string" && isModelCompatibleWithSubagent(selectedMapModel, selectedSubagent) && existingConfig.defaultModel !== selectedMapModel) {
+        existingConfig.defaultModel = selectedMapModel;
+        needsUpdate = true;
+      }
       if (existingConfig.defaultMaxIterations === 50) {
         existingConfig.defaultMaxIterations = DEFAULT_CONFIG.defaultMaxIterations;
         needsUpdate = true;
@@ -2553,6 +2667,178 @@ function validateHooksConfig(hooks) {
 // src/core/engine.ts
 init_advanced_logger();
 init_shell_backend();
+
+// src/core/prompt-command-substitution.ts
+init_version();
+var SINGLE_QUOTED_MARKER = "!'";
+var TRIPLE_BACKTICK_MARKER = "!```";
+var TRIPLE_BACKTICK_CLOSER = "```";
+var DEFAULT_MAX_BUFFER_BYTES = 1024 * 1024;
+var DEFAULT_COMMAND_TIMEOUT_MS = 3e4;
+var COMMAND_TIMEOUT_ENV_KEY = "JUNO_CODE_PROMPT_SUBSTITUTION_TIMEOUT_MS";
+function findPromptCommandSubstitutions(prompt) {
+  const matches = [];
+  let cursor = 0;
+  while (cursor < prompt.length) {
+    const singleQuotedStart = prompt.indexOf(SINGLE_QUOTED_MARKER, cursor);
+    const tripleBacktickStart = prompt.indexOf(TRIPLE_BACKTICK_MARKER, cursor);
+    const markerStart = chooseNearestMarker(singleQuotedStart, tripleBacktickStart);
+    if (markerStart === null) {
+      break;
+    }
+    if (markerStart === singleQuotedStart) {
+      const parsedSingleQuoted = parseSingleQuotedSubstitution(prompt, markerStart);
+      if (!parsedSingleQuoted) {
+        cursor = markerStart + SINGLE_QUOTED_MARKER.length;
+        continue;
+      }
+      matches.push(parsedSingleQuoted);
+      cursor = parsedSingleQuoted.endIndex;
+      continue;
+    }
+    const parsedTripleBacktick = parseTripleBacktickSubstitution(prompt, markerStart);
+    if (!parsedTripleBacktick) {
+      cursor = markerStart + TRIPLE_BACKTICK_MARKER.length;
+      continue;
+    }
+    matches.push(parsedTripleBacktick);
+    cursor = parsedTripleBacktick.endIndex;
+  }
+  return matches;
+}
+async function resolvePromptCommandSubstitutions(prompt, options) {
+  const matches = findPromptCommandSubstitutions(prompt);
+  if (matches.length === 0) {
+    return prompt;
+  }
+  const executor = options.executor ?? createDefaultPromptCommandExecutor(options);
+  let result = "";
+  let cursor = 0;
+  for (const match of matches) {
+    result += prompt.slice(cursor, match.startIndex);
+    const commandOutput = await executor(match.command);
+    result += normalizeCommandOutput(commandOutput);
+    cursor = match.endIndex;
+  }
+  result += prompt.slice(cursor);
+  return result;
+}
+function chooseNearestMarker(singleQuotedStart, tripleBacktickStart) {
+  const singleExists = singleQuotedStart >= 0;
+  const tripleExists = tripleBacktickStart >= 0;
+  if (!singleExists && !tripleExists) {
+    return null;
+  }
+  if (!singleExists) {
+    return tripleBacktickStart;
+  }
+  if (!tripleExists) {
+    return singleQuotedStart;
+  }
+  return Math.min(singleQuotedStart, tripleBacktickStart);
+}
+function parseSingleQuotedSubstitution(prompt, markerStart) {
+  const contentStart = markerStart + SINGLE_QUOTED_MARKER.length;
+  const closingQuote = findClosingSingleQuote(prompt, contentStart);
+  if (closingQuote < 0) {
+    return null;
+  }
+  const raw = prompt.slice(markerStart, closingQuote + 1);
+  const command = prompt.slice(contentStart, closingQuote);
+  return {
+    syntax: "single-quoted",
+    startIndex: markerStart,
+    endIndex: closingQuote + 1,
+    command,
+    raw
+  };
+}
+function findClosingSingleQuote(prompt, startIndex) {
+  let escaped = false;
+  for (let index = startIndex; index < prompt.length; index++) {
+    const char = prompt[index];
+    if (char === "'" && !escaped) {
+      return index;
+    }
+    if (char === "\\" && !escaped) {
+      escaped = true;
+      continue;
+    }
+    escaped = false;
+  }
+  return -1;
+}
+function parseTripleBacktickSubstitution(prompt, markerStart) {
+  const contentStart = markerStart + TRIPLE_BACKTICK_MARKER.length;
+  const closingBackticks = prompt.indexOf(TRIPLE_BACKTICK_CLOSER, contentStart);
+  if (closingBackticks < 0) {
+    return null;
+  }
+  const raw = prompt.slice(markerStart, closingBackticks + TRIPLE_BACKTICK_CLOSER.length);
+  const command = prompt.slice(contentStart, closingBackticks);
+  return {
+    syntax: "triple-backtick",
+    startIndex: markerStart,
+    endIndex: closingBackticks + TRIPLE_BACKTICK_CLOSER.length,
+    command,
+    raw
+  };
+}
+function createDefaultPromptCommandExecutor(options) {
+  const execFile2 = promisify(childProcess.execFile);
+  const maxBufferBytes = options.maxBufferBytes ?? DEFAULT_MAX_BUFFER_BYTES;
+  const commandTimeoutMs = resolvePromptCommandTimeoutMs(options.commandTimeoutMs);
+  const shell = process.env.SHELL || "/bin/bash";
+  return async (command) => {
+    const normalizedCommand = command.trim();
+    if (!normalizedCommand) {
+      return "";
+    }
+    const commandForExecution = wrapCommandForNonInteractiveExecution(normalizedCommand);
+    try {
+      const result = await execFile2(shell, ["-lc", commandForExecution], {
+        cwd: options.workingDirectory,
+        env: options.environment ?? process.env,
+        maxBuffer: maxBufferBytes,
+        timeout: commandTimeoutMs
+      });
+      const stdout2 = typeof result === "string" || Buffer.isBuffer(result) ? String(result) : String(result.stdout ?? "");
+      return stdout2;
+    } catch (error) {
+      const failedCommand = normalizedCommand.replace(/\s+/g, " ").trim();
+      const details = error && typeof error === "object" && "stderr" in error ? String(error.stderr ?? "").trim() : "";
+      const timeoutDetected = error && typeof error === "object" && (("code" in error ? String(error.code ?? "").toUpperCase() === "ETIMEDOUT" : false) || "killed" in error && Boolean(error.killed) && String(error.signal ?? "").toUpperCase() === "SIGTERM" || "message" in error && /timed?\s*out/i.test(String(error.message ?? "")));
+      if (timeoutDetected) {
+        throw new Error(
+          `Prompt command substitution timed out after ${commandTimeoutMs}ms for \`${failedCommand}\``
+        );
+      }
+      const suffix = details ? `: ${details}` : "";
+      throw new Error(`Prompt command substitution failed for \`${failedCommand}\`${suffix}`);
+    }
+  };
+}
+function resolvePromptCommandTimeoutMs(explicitTimeoutMs) {
+  if (typeof explicitTimeoutMs === "number" && Number.isFinite(explicitTimeoutMs) && explicitTimeoutMs > 0) {
+    return explicitTimeoutMs;
+  }
+  const envValue = process.env[COMMAND_TIMEOUT_ENV_KEY];
+  if (envValue !== void 0) {
+    const parsed = Number(envValue);
+    if (Number.isFinite(parsed) && parsed > 0) {
+      return parsed;
+    }
+  }
+  return DEFAULT_COMMAND_TIMEOUT_MS;
+}
+function wrapCommandForNonInteractiveExecution(command) {
+  return `(${command}) </dev/null`;
+}
+function normalizeCommandOutput(output) {
+  return output.replace(/\r?\n$/, "");
+}
+
+// src/core/engine.ts
 var ExecutionStatus = /* @__PURE__ */ ((ExecutionStatus2) => {
   ExecutionStatus2["PENDING"] = "pending";
   ExecutionStatus2["RUNNING"] = "running";
@@ -2859,7 +3145,8 @@ var ExecutionEngine = class extends EventEmitter {
     if (!request.requestId?.trim()) {
       throw new Error("Request ID is required");
     }
-    if (!request.instruction?.trim()) {
+    const allowEmptyInstructionForPiLiveInteractiveSession = request.subagent === "pi" && request.live === true && request.liveInteractiveSession === true && typeof request.resume === "string" && request.resume.trim().length > 0;
+    if (!request.instruction?.trim() && !allowEmptyInstructionForPiLiveInteractiveSession) {
       throw new Error("Instruction is required");
     }
     if (!request.subagent?.trim()) {
@@ -3097,44 +3384,62 @@ var ExecutionEngine = class extends EventEmitter {
       engineLogger.warn("Hook START_ITERATION failed", { error, iterationNumber });
     }
     this.emit("iteration:start", { context, iterationNumber });
-    const toolRequest = {
-      toolName: this.getToolNameForSubagent(context.request.subagent),
-      arguments: {
-        instruction: context.request.instruction,
-        project_path: context.request.workingDirectory,
-        ...context.request.model !== void 0 && { model: context.request.model },
-        ...context.request.agents !== void 0 && { agents: context.request.agents },
-        ...context.request.tools !== void 0 && { tools: context.request.tools },
-        ...context.request.allowedTools !== void 0 && {
-          allowedTools: context.request.allowedTools
-        },
-        ...context.request.appendAllowedTools !== void 0 && {
-          appendAllowedTools: context.request.appendAllowedTools
-        },
-        ...context.request.disallowedTools !== void 0 && {
-          disallowedTools: context.request.disallowedTools
+    let toolRequest = null;
+    try {
+      const instructionTemplate = context.request.instruction;
+      const resolvedInstruction = await resolvePromptCommandSubstitutions(instructionTemplate, {
+        workingDirectory: context.request.workingDirectory,
+        environment: {
+          ...process.env,
+          JUNO_TASK_ROOT: process.env.JUNO_TASK_ROOT || context.request.workingDirectory
+        }
+      });
+      this.emit("iteration:instruction-resolved", {
+        context,
+        iterationNumber,
+        instruction: resolvedInstruction,
+        templateInstruction: instructionTemplate
+      });
+      toolRequest = {
+        toolName: this.getToolNameForSubagent(context.request.subagent),
+        arguments: {
+          instruction: resolvedInstruction,
+          project_path: context.request.workingDirectory,
+          ...context.request.model !== void 0 && { model: context.request.model },
+          ...context.request.agents !== void 0 && { agents: context.request.agents },
+          ...context.request.tools !== void 0 && { tools: context.request.tools },
+          ...context.request.allowedTools !== void 0 && {
+            allowedTools: context.request.allowedTools
+          },
+          ...context.request.appendAllowedTools !== void 0 && {
+            appendAllowedTools: context.request.appendAllowedTools
+          },
+          ...context.request.disallowedTools !== void 0 && {
+            disallowedTools: context.request.disallowedTools
+          },
+          ...context.request.resume !== void 0 && { resume: context.request.resume },
+          ...context.request.continueConversation !== void 0 && {
+            continueConversation: context.request.continueConversation
+          },
+          ...context.request.thinking !== void 0 && { thinking: context.request.thinking },
+          ...context.request.live !== void 0 && { live: context.request.live },
+          ...context.request.liveInteractiveSession !== void 0 && {
+            liveInteractiveSession: context.request.liveInteractiveSession
+          },
+          iteration: iterationNumber
         },
-        ...context.request.resume !== void 0 && { resume: context.request.resume },
-        ...context.request.continueConversation !== void 0 && {
-          continueConversation: context.request.continueConversation
+        timeout: context.request.timeoutMs || this.engineConfig.config.mcpTimeout,
+        priority: context.request.priority || "normal",
+        metadata: {
+          sessionId: context.sessionContext.sessionId,
+          iterationNumber
         },
-        ...context.request.thinking !== void 0 && { thinking: context.request.thinking },
-        ...context.request.live !== void 0 && { live: context.request.live },
-        iteration: iterationNumber
-      },
-      timeout: context.request.timeoutMs || this.engineConfig.config.mcpTimeout,
-      priority: context.request.priority || "normal",
-      metadata: {
-        sessionId: context.sessionContext.sessionId,
-        iterationNumber
-      },
-      progressCallback: async (event) => {
-        context.progressEvents.push(event);
-        context.statistics.totalProgressEvents++;
-        await this.processProgressEvent(context, event);
-      }
-    };
-    try {
+        progressCallback: async (event) => {
+          context.progressEvents.push(event);
+          context.statistics.totalProgressEvents++;
+          await this.processProgressEvent(context, event);
+        }
+      };
       if (!this.currentBackend) {
         throw new Error("No backend initialized. Call initializeBackend() first.");
       }
@@ -3203,7 +3508,10 @@ var ExecutionEngine = class extends EventEmitter {
           duration,
           error: mcpError,
           progressEvents: [],
-          request: toolRequest
+          request: toolRequest ?? {
+            toolName: this.getToolNameForSubagent(context.request.subagent),
+            arguments: {}
+          }
         },
         progressEvents: [],
         error: mcpError
@@ -3718,6 +4026,9 @@ function createExecutionRequest(options) {
   if (options.live !== void 0) {
     result.live = options.live;
   }
+  if (options.liveInteractiveSession !== void 0) {
+    result.liveInteractiveSession = options.liveInteractiveSession;
+  }
   return result;
 }