juno-code 1.0.51 → 1.0.53

package/dist/bin/cli.js

@@ -13,9 +13,9 @@ var yaml = require('js-yaml');
 var crypto = require('crypto');
 var chalk21 = require('chalk');
 var execa = require('execa');
-var child_process = require('child_process');
-var events = require('events');
+var childProcess = require('child_process');
 var util = require('util');
+var events = require('events');
 var commander = require('commander');
 var readline = require('readline');
 var uuid = require('uuid');
@@ -54,6 +54,7 @@ var semver__default = /*#__PURE__*/_interopDefault(semver);
 var fs8__namespace = /*#__PURE__*/_interopNamespace(fs8);
 var yaml__namespace = /*#__PURE__*/_interopNamespace(yaml);
 var chalk21__default = /*#__PURE__*/_interopDefault(chalk21);
+var childProcess__namespace = /*#__PURE__*/_interopNamespace(childProcess);
 var readline__namespace = /*#__PURE__*/_interopNamespace(readline);
 var process2__namespace = /*#__PURE__*/_interopNamespace(process2);
 var Table__default = /*#__PURE__*/_interopDefault(Table);
@@ -292,14 +293,14 @@ function isModelCompatibleWithSubagent(model, subagent) {
   }
 }
 function getConfiguredDefaultModelForSubagent(config, subagent) {
-  const legacyDefaultModel = config.defaultSubagent === subagent && typeof config.defaultModel === "string" && isModelCompatibleWithSubagent(config.defaultModel, subagent) ? config.defaultModel : void 0;
-  if (legacyDefaultModel) {
-    return legacyDefaultModel;
-  }
   const modelFromMap = config.defaultModels?.[subagent];
   if (typeof modelFromMap === "string" && isModelCompatibleWithSubagent(modelFromMap, subagent)) {
     return modelFromMap;
   }
+  const legacyDefaultModel = config.defaultSubagent === subagent && typeof config.defaultModel === "string" && isModelCompatibleWithSubagent(config.defaultModel, subagent) ? config.defaultModel : void 0;
+  if (legacyDefaultModel) {
+    return legacyDefaultModel;
+  }
   return void 0;
 }
 var SUBAGENT_DEFAULT_MODELS;
@@ -867,6 +868,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;
@@ -2391,25 +2399,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,
@@ -2418,6 +2429,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;
@@ -2669,6 +2683,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");
           }
@@ -2693,7 +2710,7 @@ var init_shell_backend = __esm({
               `Pi live mode stdio: ${shouldAttachLiveTerminal ? "inherit (interactive TTY or stdout-tty fallback)" : "pipe (headless/non-TTY)"}`
             );
           }
-          const child = child_process.spawn(command, args, {
+          const child = childProcess.spawn(command, args, {
             env: env2,
             cwd: this.config.workingDirectory,
             stdio: shouldAttachLiveTerminal ? "inherit" : ["pipe", "pipe", "pipe"]
@@ -2951,8 +2968,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") {
@@ -2972,16 +3000,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 = {
@@ -2989,9 +3012,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,
@@ -3009,6 +3032,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) {
@@ -3073,6 +3147,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.
        */
@@ -3331,6 +3419,179 @@ var init_shell_backend = __esm({
     };
   }
 });
+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 execFile3 = util.promisify(childProcess__namespace.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 execFile3(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$/, "");
+}
+var SINGLE_QUOTED_MARKER, TRIPLE_BACKTICK_MARKER, TRIPLE_BACKTICK_CLOSER, DEFAULT_MAX_BUFFER_BYTES, DEFAULT_COMMAND_TIMEOUT_MS, COMMAND_TIMEOUT_ENV_KEY;
+var init_prompt_command_substitution = __esm({
+  "src/core/prompt-command-substitution.ts"() {
+    init_version();
+    SINGLE_QUOTED_MARKER = "!'";
+    TRIPLE_BACKTICK_MARKER = "!```";
+    TRIPLE_BACKTICK_CLOSER = "```";
+    DEFAULT_MAX_BUFFER_BYTES = 1024 * 1024;
+    DEFAULT_COMMAND_TIMEOUT_MS = 3e4;
+    COMMAND_TIMEOUT_ENV_KEY = "JUNO_CODE_PROMPT_SUBSTITUTION_TIMEOUT_MS";
+  }
+});
 function createExecutionEngine(config) {
   return new ExecutionEngine({
     config,
@@ -3381,6 +3642,9 @@ function createExecutionRequest(options) {
   if (options.live !== void 0) {
     result.live = options.live;
   }
+  if (options.liveInteractiveSession !== void 0) {
+    result.liveInteractiveSession = options.liveInteractiveSession;
+  }
   return result;
 }
 var DEFAULT_ERROR_RECOVERY_CONFIG, DEFAULT_RATE_LIMIT_CONFIG, DEFAULT_PROGRESS_CONFIG, ExecutionEngine;
@@ -3391,6 +3655,7 @@ var init_engine = __esm({
     init_hooks();
     init_advanced_logger();
     init_shell_backend();
+    init_prompt_command_substitution();
     DEFAULT_ERROR_RECOVERY_CONFIG = {
       maxAttempts: {
         connection: 3,
@@ -3687,7 +3952,8 @@ var init_engine = __esm({
         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()) {
@@ -3925,44 +4191,62 @@ var init_engine = __esm({
           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.");
           }
@@ -4031,7 +4315,10 @@ var init_engine = __esm({
               duration,
               error: mcpError,
               progressEvents: [],
-              request: toolRequest
+              request: toolRequest ?? {
+                toolName: this.getToolNameForSubagent(context.request.subagent),
+                arguments: {}
+              }
             },
             progressEvents: [],
             error: mcpError
@@ -4970,7 +5257,7 @@ var init_concurrent_feedback_collector = __esm({
           );
         }
         return new Promise((resolve7) => {
-          const child = child_process.spawn(this.options.command, this.options.commandArgs, {
+          const child = childProcess.spawn(this.options.command, this.options.commandArgs, {
             stdio: ["pipe", "pipe", "pipe"]
           });
           child.stdout?.on("data", (d) => {
@@ -5103,10 +5390,13 @@ var init_terminal_progress_writer = __esm({
 // src/cli/commands/main.ts
 var main_exports = {};
 __export(main_exports, {
+  expandKanbanTaskReferencesInPrompt: () => expandKanbanTaskReferencesInPrompt,
   getActiveSessionId: () => getActiveSessionId,
   getDefaultModelForSubagent: () => getDefaultModelForSubagent,
   isModelCompatibleWithSubagent: () => isModelCompatibleWithSubagent,
-  mainCommandHandler: () => mainCommandHandler
+  mainCommandHandler: () => mainCommandHandler,
+  normalizeLeadingPromptDirectiveArtifacts: () => normalizeLeadingPromptDirectiveArtifacts,
+  rewriteLeadingPromptShortcut: () => rewriteLeadingPromptShortcut
 });
 function normalizeVerboseLevel(verbose, quiet) {
   if (quiet) return 0;
@@ -5173,6 +5463,169 @@ function toStringArray(value) {
   const normalized = value.map((entry) => typeof entry === "string" ? entry.trim() : "").filter((entry) => entry.length > 0);
   return normalized.length > 0 ? normalized : void 0;
 }
+function extractReferencedKanbanTaskIds(prompt) {
+  const taskIds = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const match of prompt.matchAll(KANBAN_TASK_REFERENCE_REGEX)) {
+    const taskId = match[1];
+    if (!taskId || seen.has(taskId)) {
+      continue;
+    }
+    seen.add(taskId);
+    taskIds.push(taskId);
+  }
+  return taskIds;
+}
+function normalizeKanbanTaskArray(payload) {
+  if (Array.isArray(payload)) {
+    return payload.filter((entry) => Boolean(entry) && typeof entry === "object");
+  }
+  if (payload && typeof payload === "object") {
+    return [payload];
+  }
+  return [];
+}
+async function runKanbanGetCommand(command, args, workingDirectory) {
+  try {
+    const execFile3 = util.promisify(childProcess__namespace.execFile);
+    const result = await execFile3(command, args, {
+      cwd: workingDirectory,
+      env: {
+        ...process.env,
+        JUNO_TASK_ROOT: process.env.JUNO_TASK_ROOT || workingDirectory
+      },
+      maxBuffer: 1024 * 1024
+    });
+    const stdout2 = typeof result === "string" || Buffer.isBuffer(result) ? String(result) : String(result.stdout ?? "");
+    const parsed = JSON.parse(stdout2);
+    return normalizeKanbanTaskArray(parsed);
+  } catch {
+    return null;
+  }
+}
+async function fetchKanbanTasksForCommand(command, taskIds, workingDirectory) {
+  const tasksById = /* @__PURE__ */ new Map();
+  if (taskIds.length === 0) {
+    return tasksById;
+  }
+  const requestedTaskIds = new Set(taskIds);
+  const addFetchedTasks = (fetchedTasks) => {
+    if (!fetchedTasks) {
+      return;
+    }
+    for (const task of fetchedTasks) {
+      const taskId = typeof task.id === "string" ? task.id : void 0;
+      if (!taskId || !requestedTaskIds.has(taskId)) {
+        continue;
+      }
+      tasksById.set(taskId, task);
+    }
+  };
+  addFetchedTasks(await runKanbanGetCommand(command, ["get", ...taskIds], workingDirectory));
+  const unresolvedTaskIds = taskIds.filter((taskId) => !tasksById.has(taskId));
+  for (const taskId of unresolvedTaskIds) {
+    addFetchedTasks(await runKanbanGetCommand(command, ["get", taskId], workingDirectory));
+  }
+  return tasksById;
+}
+async function fetchReferencedKanbanTasks(taskIds, workingDirectory) {
+  const tasksById = /* @__PURE__ */ new Map();
+  if (taskIds.length === 0) {
+    return tasksById;
+  }
+  const kanbanScriptPath = path15__namespace.join(workingDirectory, KANBAN_TASK_SCRIPT_RELATIVE_PATH);
+  const hasKanbanScript = await fs16__default.default.pathExists(kanbanScriptPath);
+  const commandAttempts = [];
+  if (hasKanbanScript) {
+    commandAttempts.push(kanbanScriptPath);
+  }
+  commandAttempts.push("juno-kanban");
+  let unresolvedTaskIds = [...taskIds];
+  for (const command of commandAttempts) {
+    if (unresolvedTaskIds.length === 0) {
+      break;
+    }
+    const fetchedTasks = await fetchKanbanTasksForCommand(command, unresolvedTaskIds, workingDirectory);
+    if (fetchedTasks.size === 0) {
+      continue;
+    }
+    for (const [taskId, task] of fetchedTasks.entries()) {
+      tasksById.set(taskId, task);
+    }
+    unresolvedTaskIds = unresolvedTaskIds.filter((taskId) => !tasksById.has(taskId));
+  }
+  return tasksById;
+}
+async function expandKanbanTaskReferencesInPrompt(prompt, workingDirectory) {
+  const referencedTaskIds = extractReferencedKanbanTaskIds(prompt);
+  if (referencedTaskIds.length === 0) {
+    return prompt;
+  }
+  const tasksById = await fetchReferencedKanbanTasks(referencedTaskIds, workingDirectory);
+  if (tasksById.size === 0) {
+    return prompt;
+  }
+  return prompt.replace(KANBAN_TASK_REFERENCE_REGEX, (fullMatch, taskId) => {
+    const task = tasksById.get(taskId);
+    if (!task) {
+      return fullMatch;
+    }
+    return `
+[kanban_task:${taskId}]
+${JSON.stringify(task, null, 2)}
+[/kanban_task]`;
+  });
+}
+function normalizeLeadingPromptDirectiveArtifacts(prompt) {
+  const lines = prompt.split(/\r?\n/);
+  if (lines.length === 0) {
+    return prompt;
+  }
+  let index = 0;
+  while (index < lines.length && lines[index].trim() === "") {
+    index += 1;
+  }
+  if (index >= lines.length) {
+    return prompt;
+  }
+  const firstMeaningfulLine = lines[index].trim();
+  if (!LEADING_PROMPT_DELIMITER_MARKERS.has(firstMeaningfulLine)) {
+    return prompt;
+  }
+  let directiveIndex = index + 1;
+  while (directiveIndex < lines.length && lines[directiveIndex].trim() === "") {
+    directiveIndex += 1;
+  }
+  if (directiveIndex >= lines.length) {
+    return prompt;
+  }
+  const directiveCandidate = lines[directiveIndex].trimStart();
+  if (!LEADING_DIRECTIVE_LINE_REGEX.test(directiveCandidate)) {
+    return prompt;
+  }
+  return lines.slice(directiveIndex).join("\n");
+}
+function rewriteLeadingPromptShortcut(prompt, subagent) {
+  const match = prompt.match(LEADING_PROMPT_SHORTCUT_REGEX);
+  if (!match) {
+    return prompt;
+  }
+  const shortcut = match[1] ?? match[2];
+  if (!shortcut) {
+    return prompt;
+  }
+  const remaining = match[3] ?? "";
+  switch (subagent) {
+    case "claude":
+      return `/${shortcut}${remaining}`;
+    case "pi":
+      return `/skill:${shortcut}${remaining}`;
+    case "codex":
+      return `$${shortcut}${remaining}`;
+    default:
+      return prompt;
+  }
+}
 function resolveContinueEnvFilePath(workingDirectory, configuredPath) {
   const candidate = configuredPath && configuredPath.trim() ? configuredPath.trim() : DEFAULT_ENV_FILE_NAME;
   return path15__namespace.isAbsolute(candidate) ? candidate : path15__namespace.join(workingDirectory, candidate);
@@ -5575,7 +6028,13 @@ async function mainCommandHandler(_args, options, _command) {
       ]);
     }
     const promptProcessor = new PromptProcessor(options);
-    const instruction = await promptProcessor.processPrompt();
+    const rawInstruction = await promptProcessor.processPrompt();
+    const normalizedInstruction = normalizeLeadingPromptDirectiveArtifacts(rawInstruction);
+    const rewrittenInstruction = rewriteLeadingPromptShortcut(normalizedInstruction, options.subagent);
+    const instruction = await expandKanbanTaskReferencesInPrompt(
+      rewrittenInstruction,
+      config.workingDirectory
+    );
     const selectedBackend = "shell";
     if (options.allowedTools && options.appendAllowedTools) {
       console.error(
@@ -5594,6 +6053,7 @@ async function mainCommandHandler(_args, options, _command) {
     }
     const configuredModel = getConfiguredDefaultModelForSubagent(config, options.subagent);
     const resolvedModel = options.model || configuredModel || getDefaultModelForSubagent(options.subagent);
+    const liveInteractiveSession = options.continueFromLatest === true && options.subagent === "pi" && options.live === true && instruction.length === 0 && typeof options.resume === "string" && options.resume.trim().length > 0;
     const executionRequest = createExecutionRequest({
       instruction,
       subagent: options.subagent,
@@ -5609,7 +6069,8 @@ async function mainCommandHandler(_args, options, _command) {
       ...options.resume !== void 0 ? { resume: options.resume } : {},
       ...options.continue !== void 0 ? { continueConversation: options.continue } : {},
       ...options.thinking !== void 0 ? { thinking: options.thinking } : {},
-      ...options.live !== void 0 ? { live: options.live } : {}
+      ...options.live !== void 0 ? { live: options.live } : {},
+      ...liveInteractiveSession ? { liveInteractiveSession: true } : {}
     });
     const coordinator = new MainExecutionCoordinator(
       config,
@@ -5687,7 +6148,7 @@ async function mainCommandHandler(_args, options, _command) {
     }
   }
 }
-var SESSION_HISTORY_VERSION, SESSION_HISTORY_FILE_NAME, CONTINUE_SETTINGS_VERSION, DEFAULT_ENV_FILE_NAME, PromptProcessor, _activeSessionId, MainProgressDisplay, MainExecutionCoordinator;
+var SESSION_HISTORY_VERSION, SESSION_HISTORY_FILE_NAME, CONTINUE_SETTINGS_VERSION, DEFAULT_ENV_FILE_NAME, LEADING_PROMPT_SHORTCUT_REGEX, LEADING_PROMPT_DELIMITER_MARKERS, LEADING_DIRECTIVE_LINE_REGEX, KANBAN_TASK_REFERENCE_REGEX, KANBAN_TASK_SCRIPT_RELATIVE_PATH, PromptProcessor, _activeSessionId, MainProgressDisplay, MainExecutionCoordinator;
 var init_main = __esm({
   "src/cli/commands/main.ts"() {
     init_version();
@@ -5704,6 +6165,11 @@ var init_main = __esm({
     SESSION_HISTORY_FILE_NAME = "session_history.json";
     CONTINUE_SETTINGS_VERSION = 1;
     DEFAULT_ENV_FILE_NAME = ".env.juno";
+    LEADING_PROMPT_SHORTCUT_REGEX = /^%(?:\{([^\s{}]+)\}|([^\s%][^\s]*))(.*)$/s;
+    LEADING_PROMPT_DELIMITER_MARKERS = /* @__PURE__ */ new Set(["---", "***", "___"]);
+    LEADING_DIRECTIVE_LINE_REGEX = /^(?:%(?:\{[^\s{}]+\}|[^\s%][^\s]*)|\/skill:[^\s]+|\/[^\s]+|\$[^\s]+)/;
+    KANBAN_TASK_REFERENCE_REGEX = /(?<!#)##\s*\{?([A-Za-z0-9]{6})\}?(?![A-Za-z0-9])/g;
+    KANBAN_TASK_SCRIPT_RELATIVE_PATH = path15__namespace.join(".juno_task", "scripts", "kanban.sh");
     PromptProcessor = class {
       constructor(options) {
         this.options = options;
@@ -5721,6 +6187,9 @@ var init_main = __esm({
           if (this.hasRedirectedStdin()) {
             return await this.readPipedStdin();
           }
+          if (this.shouldOpenLiveContinueSessionWithoutPrompt()) {
+            return "";
+          }
           if (this.options.interactive) {
             return await this.collectInteractivePrompt();
           } else {
@@ -5759,6 +6228,9 @@ var init_main = __esm({
           return false;
         }
       }
+      shouldOpenLiveContinueSessionWithoutPrompt() {
+        return this.options.continueFromLatest === true && this.options.subagent === "pi" && this.options.live === true && !this.options.promptFile && this.options.prompt !== true && !this.options.interactive && !this.options.interactivePrompt;
+      }
       async isFilePath(prompt) {
         if (prompt.includes("\n") || prompt.length > 500) {
           return false;
@@ -5867,6 +6339,7 @@ var init_main = __esm({
       // iteration# → sub-agent session_id
       latestSessionId = null;
       // most recent session_id seen
+      lastResolvedInstructionByIteration = /* @__PURE__ */ new Map();
       constructor(verboseLevel = 1) {
         this.verboseLevel = verboseLevel;
       }
@@ -5893,9 +6366,18 @@ var init_main = __esm({
           console.error(chalk21__default.default.gray(`   Request ID: ${request.requestId}`));
           console.error(chalk21__default.default.gray(`   Working Directory: ${request.workingDirectory}`));
         }
-        console.error(chalk21__default.default.blue("\n\u{1F4CB} Task:"));
-        const preview = request.instruction.length > 200 ? request.instruction.substring(0, 200) + "..." : request.instruction;
-        console.error(chalk21__default.default.white(`   ${preview}`));
+        const hasPromptSubstitutionSyntax = this.hasPromptCommandSubstitutionSyntax(request.instruction);
+        if (hasPromptSubstitutionSyntax) {
+          console.error(chalk21__default.default.blue("\n\u{1F4CB} Task Template:"));
+        } else {
+          console.error(chalk21__default.default.blue("\n\u{1F4CB} Task:"));
+        }
+        console.error(chalk21__default.default.white(`   ${this.buildInstructionPreview(request.instruction)}`));
+        if (hasPromptSubstitutionSyntax) {
+          console.error(
+            chalk21__default.default.gray("   Prompt-time substitutions are resolved immediately before each subagent call.")
+          );
+        }
         console.error("");
       }
       getSelectedExecutionOptions(request) {
@@ -5929,6 +6411,32 @@ var init_main = __esm({
         if (value.length <= maxLength) return value;
         return `${value.substring(0, maxLength - 3)}...`;
       }
+      buildInstructionPreview(instruction, maxLength = 200) {
+        if (instruction.length <= maxLength) {
+          return instruction;
+        }
+        return `${instruction.substring(0, maxLength)}...`;
+      }
+      hasPromptCommandSubstitutionSyntax(instruction) {
+        return instruction.includes("!'") || instruction.includes("!```");
+      }
+      onInstructionResolved(iteration, resolvedInstruction, templateInstruction) {
+        const previousInstruction = this.lastResolvedInstructionByIteration.get(iteration);
+        if (previousInstruction === resolvedInstruction) {
+          return;
+        }
+        this.lastResolvedInstructionByIteration.set(iteration, resolvedInstruction);
+        if (this.verboseLevel === 0) {
+          return;
+        }
+        if (templateInstruction !== void 0 && resolvedInstruction === templateInstruction) {
+          return;
+        }
+        const heading = iteration === 1 ? "\n\u{1F9E9} Resolved Task (iteration 1):" : `
+\u{1F9E9} Resolved Task (iteration ${iteration}):`;
+        console.error(chalk21__default.default.blue(heading));
+        console.error(chalk21__default.default.white(`   ${this.buildInstructionPreview(resolvedInstruction)}`));
+      }
       onProgress(event) {
         const timestamp = event.timestamp.toLocaleTimeString();
         if (event.metadata?.sessionId && typeof event.metadata.sessionId === "string") {
@@ -6006,7 +6514,10 @@ var init_main = __esm({
         if (this.verboseLevel === 0) {
           const lastIteration2 = result.iterations[result.iterations.length - 1];
           if (lastIteration2?.toolResult.content && !this.hasStreamedJsonOutput) {
-            console.log(lastIteration2.toolResult.content);
+            const displayContent = this.getDisplayResultContent(lastIteration2.toolResult.content);
+            if (displayContent.trim().length > 0) {
+              console.log(displayContent);
+            }
           }
           return;
         }
@@ -6019,12 +6530,14 @@ var init_main = __esm({
         }
         const lastIteration = result.iterations[result.iterations.length - 1];
         const structuredOutput = lastIteration?.toolResult.metadata?.structuredOutput === true;
+        const rawResultContent = lastIteration?.toolResult.content || "";
+        const displayResultContent = rawResultContent ? this.getDisplayResultContent(rawResultContent) : "";
         const shouldPrintResult = Boolean(
-          lastIteration && lastIteration.toolResult.content && (!this.hasStreamedJsonOutput || structuredOutput)
+          lastIteration && displayResultContent && (!this.hasStreamedJsonOutput || structuredOutput)
         );
         if (shouldPrintResult) {
           console.error(chalk21__default.default.blue("\n\u{1F4C4} Result:"));
-          console.log(lastIteration.toolResult.content);
+          console.log(displayResultContent);
         }
         const iterationCosts = this.extractIterationCosts(result);
         const totalCostUsd = [...iterationCosts.values()].reduce((sum, cost) => sum + cost, 0);
@@ -6094,6 +6607,26 @@ var init_main = __esm({
           console.error(chalk21__default.default.gray("\n\u{1F511} Session ID: could not be extracted"));
         }
       }
+      getDisplayResultContent(content) {
+        if (this.verboseLevel >= 2) {
+          return content;
+        }
+        try {
+          const payload = JSON.parse(content);
+          if (payload?.type === "result" && Object.prototype.hasOwnProperty.call(payload, "result")) {
+            const resultValue = payload.result;
+            if (typeof resultValue === "string") {
+              return resultValue;
+            }
+            if (resultValue === null || resultValue === void 0) {
+              return "";
+            }
+            return JSON.stringify(resultValue, null, 2);
+          }
+        } catch {
+        }
+        return content;
+      }
       /**
        * Extract session IDs from iteration results' structured payloads
        */
@@ -6242,6 +6775,13 @@ var init_main = __esm({
         engine.on("iteration:start", ({ iterationNumber }) => {
           this.progressDisplay.onIterationStart(iterationNumber);
         });
+        engine.on("iteration:instruction-resolved", ({ iterationNumber, instruction, templateInstruction }) => {
+          this.progressDisplay.onInstructionResolved(
+            iterationNumber,
+            typeof instruction === "string" ? instruction : "",
+            typeof templateInstruction === "string" ? templateInstruction : void 0
+          );
+        });
         engine.on("iteration:complete", ({ iterationResult }) => {
           this.progressDisplay.onIterationComplete(iterationResult.success, iterationResult.duration);
         });
@@ -14807,6 +15347,26 @@ function normalizeVerbose(value) {
   if (!isNaN(num) && num >= 0 && num <= 2) return Math.floor(num);
   return 1;
 }
+function extractOptionValueFromArgv(argv2, longOption, shortOption) {
+  for (let i = 0; i < argv2.length; i++) {
+    const token = argv2[i];
+    if (!token) continue;
+    if (token === longOption || token === shortOption) {
+      const next = argv2[i + 1];
+      if (next && !next.startsWith("-")) {
+        return next;
+      }
+      continue;
+    }
+    if (token.startsWith(`${longOption}=`)) {
+      return token.slice(longOption.length + 1);
+    }
+    if (token.startsWith(`${shortOption}=`)) {
+      return token.slice(shortOption.length + 1);
+    }
+  }
+  return void 0;
+}
 function isConnectionLikeError(err) {
   const msg = err instanceof Error ? `${err.name}: ${err.message}` : String(err);
   const lower = msg.toLowerCase();
@@ -14937,6 +15497,15 @@ function getForwardedUntilCompletionArgs() {
     if (arg.startsWith("--pre-run-hook=")) {
       continue;
     }
+    if (arg === "--cwd" || arg === "-w") {
+      if (i + 1 < args.length && args[i + 1] && !args[i + 1].startsWith("-")) {
+        i += 1;
+      }
+      continue;
+    }
+    if (arg.startsWith("--cwd=") || arg.startsWith("-w=")) {
+      continue;
+    }
     forwardedArgs.push(arg);
   }
   return forwardedArgs;
@@ -14948,7 +15517,9 @@ async function runUntilCompletionScriptIfRequested(options) {
   const { spawn: spawn3 } = await import('child_process');
   const path21 = await import('path');
   const fs22 = await import('fs-extra');
-  const scriptPath = path21.join(process.cwd(), ".juno_task", "scripts", "run_until_completion.sh");
+  const optionCwd = typeof options.cwd === "string" && options.cwd.trim().length > 0 ? options.cwd.trim() : extractOptionValueFromArgv(process.argv.slice(2), "--cwd", "-w");
+  const invocationCwd = typeof optionCwd === "string" && optionCwd.trim().length > 0 ? path21.resolve(process.cwd(), optionCwd) : process.cwd();
+  const scriptPath = path21.join(invocationCwd, ".juno_task", "scripts", "run_until_completion.sh");
   if (!await fs22.pathExists(scriptPath)) {
     console.error(chalk21__default.default.red.bold("\n\u274C Error: run_until_completion.sh not found"));
     console.error(chalk21__default.default.red(`   Expected location: ${scriptPath}`));
@@ -14965,7 +15536,7 @@ async function runUntilCompletionScriptIfRequested(options) {
   scriptArgs.push(...getForwardedUntilCompletionArgs());
   const child = spawn3(scriptPath, scriptArgs, {
     stdio: "inherit",
-    cwd: process.cwd()
+    cwd: invocationCwd
   });
   process.removeAllListeners("SIGINT");
   process.removeAllListeners("SIGTERM");
@@ -14997,9 +15568,9 @@ async function runUntilCompletionScriptIfRequested(options) {
   return true;
 }
 function setupContinueCommand(program) {
-  const continueCommand = program.command("continue").description("Continue the most recent juno-code session with saved settings").argument("[prompt_text...]", "Prompt text (positional, alternative to -p)").option(
+  const continueCommand = program.command("continue").alias("contiue").description("Continue the most recent juno-code session with saved settings").argument("[prompt_text...]", "Prompt text (positional, alternative to -p)").option(
     "-p, --prompt [text]",
-    "Prompt input (inline text, file path, or use with heredoc/stdin; prefer single quotes for shell metacharacters)"
+    "Prompt input (inline text, file path, or heredoc/stdin; supports !'cmd' and !```cmd``` substitutions, prefer single quotes for shell metacharacters)"
   ).option("-f, --prompt-file <path>", "Read prompt from a file (shell-safe for backticks/$())").option("-w, --cwd <path>", "Working directory").option("-i, --max-iterations <number>", "Override max iterations for this continue run", parseInt).option("-m, --model <name>", "Override model for this continue run").option("-s, --subagent <name>", "Override subagent for this continue run").option("-I, --interactive", "Interactive mode for typing prompts").option("--live", "Run Pi subagent in interactive live TUI mode (pi only)").option("--thinking <level>", "Override thinking level for this continue run").action(async (promptArgs, options, command) => {
     if (promptArgs.length > 0 && options.prompt === void 0) {
       options.prompt = promptArgs.join(" ");
@@ -15074,7 +15645,7 @@ function setupContinueScopeCommand(program) {
 function setupMainCommand(program) {
   program.argument("[prompt_text...]", "Prompt text (positional, alternative to -p)").option(
     "-p, --prompt [text]",
-    "Prompt input (inline text, file path, or use with heredoc/stdin; prefer single quotes for shell metacharacters)"
+    "Prompt input (inline text, file path, or heredoc/stdin; supports !'cmd' and !```cmd``` substitutions, prefer single quotes for shell metacharacters)"
   ).option("-f, --prompt-file <path>", "Read prompt from a file (shell-safe for backticks/$())").option("-w, --cwd <path>", "Working directory").option("-i, --max-iterations <number>", "Maximum iterations (-1 for unlimited)", parseInt).option("-I, --interactive", "Interactive mode for typing prompts").option("--live", "Run Pi subagent in interactive live TUI mode (pi only)").option("-ip, --interactive-prompt", "Launch interactive prompt editor").action(async (promptArgs, options, command) => {
     if (promptArgs.length > 0 && options.prompt === void 0) {
       options.prompt = promptArgs.join(" ");
@@ -15248,6 +15819,11 @@ ${chalk21__default.default.blue("Examples:")}
 
   ${chalk21__default.default.gray("# Shell safety")}
   ${chalk21__default.default.gray("Use single quotes (or -f/stdin) when prompts contain backticks or $()")}
+
+  ${chalk21__default.default.gray("# Prompt-time substitutions (refreshed each iteration)")}
+  juno-code claude -p "Status: !'git status --short'"
+  juno-code claude -i 3 -p "Recent commits:
+!\`\`\`git log -n 5 --oneline\`\`\`"
 `
   },
   pi: {
@@ -15436,7 +16012,7 @@ function setupAliases(program) {
     if (!help) continue;
     const cmd = program.command(subagent).description(help.description).argument("[prompt...]", "Prompt text or file path").option(
       "-p, --prompt [text]",
-      "Prompt input (inline text, or use with heredoc/stdin; prefer single quotes for shell metacharacters)"
+      "Prompt input (inline text, or heredoc/stdin; supports !'cmd' and !```cmd``` substitutions, prefer single quotes for shell metacharacters)"
     ).option("-f, --prompt-file <path>", "Read prompt from a file (shell-safe for backticks/$())").option("-w, --cwd <path>", "Working directory").option("-i, --max-iterations <number>", "Maximum iterations (-1 for unlimited)", parseInt).option("-m, --model <name>", "Model to use (see model shorthands below)").option("-r, --resume <sessionId>", "Resume a conversation by session ID").option("--continue", "Continue the most recent conversation").option("-I, --interactive", "Interactive mode for typing prompts").option("--live", "Run Pi subagent in interactive live TUI mode (pi only)").addHelpText("after", help.helpText).action(async (promptArgs, options, command) => {
       if (promptArgs.length > 0 && options.prompt === void 0) {
         options.prompt = promptArgs.join(" ");
@@ -15461,9 +16037,24 @@ function setupAliases(program) {
         handleCLIError(error, normalizeVerbose(options.verbose));
       }
     });
-    cmd.command("set-default-model <model>").description(`Set default model for the ${subagent} subagent in .juno_task/config.json`).option("-w, --cwd <path>", "Working directory").action(async (model, commandOptions) => {
+    cmd.command("set-default-model <model>").description(`Set default model for the ${subagent} subagent in .juno_task/config.json`).option("-w, --cwd <path>", "Working directory").action(async (model, commandOptions, command) => {
+      const mergedOptions = (() => {
+        const commandWithGlobals = command;
+        if (typeof commandWithGlobals.optsWithGlobals === "function") {
+          return {
+            ...commandWithGlobals.optsWithGlobals(),
+            ...commandOptions
+          };
+        }
+        const parentOptions = command.parent?.opts ? command.parent.opts() : {};
+        return {
+          ...parentOptions,
+          ...commandOptions
+        };
+      })();
       try {
-        const workingDirectory = typeof commandOptions.cwd === "string" && commandOptions.cwd.trim().length > 0 ? commandOptions.cwd.trim() : process.cwd();
+        const optionCwd = typeof mergedOptions.cwd === "string" && mergedOptions.cwd.trim().length > 0 ? mergedOptions.cwd.trim() : extractOptionValueFromArgv(process.argv.slice(2), "--cwd", "-w");
+        const workingDirectory = typeof optionCwd === "string" && optionCwd.trim().length > 0 ? optionCwd.trim() : process.cwd();
         const [{ loadConfig: loadConfig2 }, subagentModels, fsExtra2, nodePath] = await Promise.all([
           Promise.resolve().then(() => (init_config(), config_exports)),
           Promise.resolve().then(() => (init_subagent_models(), subagent_models_exports)),
@@ -15504,7 +16095,7 @@ function setupAliases(program) {
           )
         );
       } catch (error) {
-        handleCLIError(error, normalizeVerbose(commandOptions.verbose));
+        handleCLIError(error, normalizeVerbose(mergedOptions.verbose));
       }
     });
     cmd.allowUnknownOption(true);
@@ -15701,6 +16292,11 @@ ${chalk21__default.default.blue.bold("Examples:")}
   ${chalk21__default.default.gray("# Shell safety")}
   ${chalk21__default.default.gray("Use single quotes or -f/stdin when prompts include backticks or $()")}
 
+  ${chalk21__default.default.gray("# Prompt-time command substitution (per iteration)")}
+  juno-code claude -p "Status: !'git status --short'"
+  juno-code claude -i 3 -p "Recent commits:
+!\`\`\`git log -n 5 --oneline\`\`\`"
+
   ${chalk21__default.default.gray("# Interactive project setup")}
   juno-code init --interactive