juno-code 1.0.32 → 1.0.34

package/dist/bin/cli.js

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 'use strict';
 
-var fs3 = require('fs-extra');
+var fs2 = require('fs-extra');
 var path3 = require('path');
-var os3 = require('os');
+var os4 = require('os');
 var url = require('url');
 var module$1 = require('module');
 var semver = require('semver');
@@ -52,9 +52,9 @@ function _interopNamespace(e) {
   return Object.freeze(n);
 }
 
-var fs3__default = /*#__PURE__*/_interopDefault(fs3);
+var fs2__default = /*#__PURE__*/_interopDefault(fs2);
 var path3__namespace = /*#__PURE__*/_interopNamespace(path3);
-var os3__namespace = /*#__PURE__*/_interopNamespace(os3);
+var os4__namespace = /*#__PURE__*/_interopNamespace(os4);
 var semver__default = /*#__PURE__*/_interopDefault(semver);
 var nodeFs__namespace = /*#__PURE__*/_interopNamespace(nodeFs);
 var yaml__namespace = /*#__PURE__*/_interopNamespace(yaml);
@@ -341,8 +341,8 @@ var init_service_installer = __esm({
   "src/utils/service-installer.ts"() {
     init_version();
     ServiceInstaller = class {
-      static SERVICES_DIR = path3__namespace.join(os3.homedir(), ".juno_code", "services");
-      static VERSION_FILE = path3__namespace.join(os3.homedir(), ".juno_code", "services", ".version");
+      static SERVICES_DIR = path3__namespace.join(os4.homedir(), ".juno_code", "services");
+      static VERSION_FILE = path3__namespace.join(os4.homedir(), ".juno_code", "services", ".version");
       /**
        * Get the current package version
        */
@@ -351,12 +351,12 @@ var init_service_installer = __esm({
           const __dirname2 = path3__namespace.dirname(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('cli.js', document.baseURI).href))));
           const require3 = module$1.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('cli.js', document.baseURI).href)));
           let packageJsonPath = path3__namespace.join(__dirname2, "..", "..", "package.json");
-          if (fs3__default.default.existsSync(packageJsonPath)) {
+          if (fs2__default.default.existsSync(packageJsonPath)) {
             const packageJson2 = require3(packageJsonPath);
             return packageJson2.version;
           }
           packageJsonPath = path3__namespace.join(__dirname2, "..", "..", "..", "package.json");
-          if (fs3__default.default.existsSync(packageJsonPath)) {
+          if (fs2__default.default.existsSync(packageJsonPath)) {
             const packageJson2 = require3(packageJsonPath);
             return packageJson2.version;
           }
@@ -370,11 +370,11 @@ var init_service_installer = __esm({
        */
       static async getInstalledVersion() {
         try {
-          const exists = await fs3__default.default.pathExists(this.VERSION_FILE);
+          const exists = await fs2__default.default.pathExists(this.VERSION_FILE);
           if (!exists) {
             return null;
           }
-          const version3 = await fs3__default.default.readFile(this.VERSION_FILE, "utf-8");
+          const version3 = await fs2__default.default.readFile(this.VERSION_FILE, "utf-8");
           return version3.trim();
         } catch {
           return null;
@@ -385,7 +385,7 @@ var init_service_installer = __esm({
        */
       static async saveVersion() {
         const version3 = this.getPackageVersion();
-        await fs3__default.default.writeFile(this.VERSION_FILE, version3, "utf-8");
+        await fs2__default.default.writeFile(this.VERSION_FILE, version3, "utf-8");
       }
       /**
        * Check if services need to be updated based on version
@@ -397,7 +397,7 @@ var init_service_installer = __esm({
           if (!installedVersion) {
             return true;
           }
-          const exists = await fs3__default.default.pathExists(this.SERVICES_DIR);
+          const exists = await fs2__default.default.pathExists(this.SERVICES_DIR);
           if (!exists) {
             return true;
           }
@@ -405,8 +405,10 @@ var init_service_installer = __esm({
             return true;
           }
           if (semver__default.default.eq(packageVersion, installedVersion)) {
-            const codexExists = await fs3__default.default.pathExists(path3__namespace.join(this.SERVICES_DIR, "codex.py"));
-            const claudeExists = await fs3__default.default.pathExists(path3__namespace.join(this.SERVICES_DIR, "claude.py"));
+            const installedCodex = path3__namespace.join(this.SERVICES_DIR, "codex.py");
+            const installedClaude = path3__namespace.join(this.SERVICES_DIR, "claude.py");
+            const codexExists = await fs2__default.default.pathExists(installedCodex);
+            const claudeExists = await fs2__default.default.pathExists(installedClaude);
             if (!codexExists || !claudeExists) {
               return true;
             }
@@ -414,15 +416,32 @@ var init_service_installer = __esm({
               const packageServicesDir = this.getPackageServicesDir();
               const packageCodex = path3__namespace.join(packageServicesDir, "codex.py");
               const packageClaude = path3__namespace.join(packageServicesDir, "claude.py");
-              const packageCodexExists = await fs3__default.default.pathExists(packageCodex);
-              const packageClaudeExists = await fs3__default.default.pathExists(packageClaude);
-              if (packageCodexExists || packageClaudeExists) {
-                const isDevelopment2 = packageServicesDir.includes("/src/");
-                if (isDevelopment2) {
+              const packageCodexExists = await fs2__default.default.pathExists(packageCodex);
+              const packageClaudeExists = await fs2__default.default.pathExists(packageClaude);
+              if (packageCodexExists) {
+                const [pkg, inst] = await Promise.all([
+                  fs2__default.default.readFile(packageCodex, "utf-8"),
+                  fs2__default.default.readFile(installedCodex, "utf-8")
+                ]);
+                if (pkg !== inst) {
                   return true;
                 }
               }
+              if (packageClaudeExists) {
+                const [pkg, inst] = await Promise.all([
+                  fs2__default.default.readFile(packageClaude, "utf-8"),
+                  fs2__default.default.readFile(installedClaude, "utf-8")
+                ]);
+                if (pkg !== inst) {
+                  return true;
+                }
+              }
+              const isDevelopment2 = packageServicesDir.includes("/src/");
+              if (isDevelopment2) {
+                return true;
+              }
             } catch {
+              return true;
             }
           }
           return false;
@@ -436,11 +455,11 @@ var init_service_installer = __esm({
       static getPackageServicesDir() {
         const __dirname2 = path3__namespace.dirname(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('cli.js', document.baseURI).href))));
         let servicesPath = path3__namespace.join(__dirname2, "..", "..", "templates", "services");
-        if (fs3__default.default.existsSync(servicesPath)) {
+        if (fs2__default.default.existsSync(servicesPath)) {
           return servicesPath;
         }
         servicesPath = path3__namespace.join(__dirname2, "..", "templates", "services");
-        if (fs3__default.default.existsSync(servicesPath)) {
+        if (fs2__default.default.existsSync(servicesPath)) {
           return servicesPath;
         }
         throw new Error("Could not find services directory in package");
@@ -451,18 +470,18 @@ var init_service_installer = __esm({
        */
       static async install(silent = false) {
         try {
-          await fs3__default.default.ensureDir(this.SERVICES_DIR);
+          await fs2__default.default.ensureDir(this.SERVICES_DIR);
           const packageServicesDir = this.getPackageServicesDir();
-          await fs3__default.default.copy(packageServicesDir, this.SERVICES_DIR, {
+          await fs2__default.default.copy(packageServicesDir, this.SERVICES_DIR, {
             overwrite: true,
             preserveTimestamps: true
           });
-          const files = await fs3__default.default.readdir(this.SERVICES_DIR);
+          const files = await fs2__default.default.readdir(this.SERVICES_DIR);
           for (const file of files) {
             const filePath = path3__namespace.join(this.SERVICES_DIR, file);
-            const stat = await fs3__default.default.stat(filePath);
+            const stat = await fs2__default.default.stat(filePath);
             if (stat.isFile() && (file.endsWith(".py") || file.endsWith(".sh"))) {
-              await fs3__default.default.chmod(filePath, 493);
+              await fs2__default.default.chmod(filePath, 493);
             }
           }
           await this.saveVersion();
@@ -509,11 +528,11 @@ var init_service_installer = __esm({
        */
       static async isInstalled() {
         try {
-          const exists = await fs3__default.default.pathExists(this.SERVICES_DIR);
+          const exists = await fs2__default.default.pathExists(this.SERVICES_DIR);
           if (!exists) {
             return false;
           }
-          const files = await fs3__default.default.readdir(this.SERVICES_DIR);
+          const files = await fs2__default.default.readdir(this.SERVICES_DIR);
           return files.length > 0;
         } catch {
           return false;
@@ -536,11 +555,11 @@ var init_service_installer = __esm({
        */
       static async listServices() {
         try {
-          const exists = await fs3__default.default.pathExists(this.SERVICES_DIR);
+          const exists = await fs2__default.default.pathExists(this.SERVICES_DIR);
           if (!exists) {
             return [];
           }
-          const files = await fs3__default.default.readdir(this.SERVICES_DIR);
+          const files = await fs2__default.default.readdir(this.SERVICES_DIR);
           return files.filter((file) => file.endsWith(".py") || file.endsWith(".sh"));
         } catch {
           return [];
@@ -551,9 +570,9 @@ var init_service_installer = __esm({
        */
       static async uninstall() {
         try {
-          const exists = await fs3__default.default.pathExists(this.SERVICES_DIR);
+          const exists = await fs2__default.default.pathExists(this.SERVICES_DIR);
           if (exists) {
-            await fs3__default.default.remove(this.SERVICES_DIR);
+            await fs2__default.default.remove(this.SERVICES_DIR);
             console.log("\u2713 Services uninstalled");
           }
         } catch (error) {
@@ -1129,17 +1148,17 @@ async function ensureHooksConfig(baseDir) {
   try {
     const configDir = path3__namespace.join(baseDir, ".juno_task");
     const configPath = path3__namespace.join(configDir, "config.json");
-    await fs3__default.default.ensureDir(configDir);
-    const configExists = await fs3__default.default.pathExists(configPath);
+    await fs2__default.default.ensureDir(configDir);
+    const configExists = await fs2__default.default.pathExists(configPath);
     const allHookTypes = getDefaultHooks();
     if (!configExists) {
       const defaultConfig = {
         ...DEFAULT_CONFIG,
         hooks: allHookTypes
       };
-      await fs3__default.default.writeJson(configPath, defaultConfig, { spaces: 2 });
+      await fs2__default.default.writeJson(configPath, defaultConfig, { spaces: 2 });
     } else {
-      const existingConfig = await fs3__default.default.readJson(configPath);
+      const existingConfig = await fs2__default.default.readJson(configPath);
       let needsUpdate = false;
       if (!existingConfig.hooks) {
         existingConfig.hooks = allHookTypes;
@@ -1157,7 +1176,7 @@ async function ensureHooksConfig(baseDir) {
         needsUpdate = true;
       }
       if (needsUpdate) {
-        await fs3__default.default.writeJson(configPath, existingConfig, { spaces: 2 });
+        await fs2__default.default.writeJson(configPath, existingConfig, { spaces: 2 });
       }
     }
   } catch (error) {
@@ -3312,13 +3331,9 @@ var init_advanced_logger = __esm({
       /**
        * Output formatted log
        */
-      output(formatted, level) {
+      output(formatted, _level) {
         if (this.options.output === "console" || this.options.output === "both") {
-          if (level >= 3 /* WARN */) {
-            console.error(formatted);
-          } else {
-            console.log(formatted);
-          }
+          console.error(formatted);
         }
         if (this.options.output === "file" || this.options.output === "both") {
           this.writeToFile(formatted);
@@ -4875,7 +4890,7 @@ var init_config2 = __esm({
           return cached;
         }
         try {
-          const configContent = await fs3__default.default.readFile(configPath, "utf-8");
+          const configContent = await fs2__default.default.readFile(configPath, "utf-8");
           const config = JSON.parse(configContent);
           this.validateConfig(config);
           const resolvedConfig = this.resolveConfigPaths(config, path3__namespace.dirname(configPath));
@@ -4897,7 +4912,7 @@ var init_config2 = __esm({
         const rootDir = path3__namespace.parse(currentDir).root;
         while (currentDir !== rootDir) {
           const configPath = path3__namespace.join(currentDir, ".juno_task", "mcp.json");
-          if (await fs3__default.default.pathExists(configPath)) {
+          if (await fs2__default.default.pathExists(configPath)) {
             return configPath;
           }
           currentDir = path3__namespace.dirname(currentDir);
@@ -5083,7 +5098,7 @@ var init_logger = __esm({
        * Matches Python's generate_log_file function
        */
       async initialize(subagent = "mcp") {
-        await fs3__default.default.ensureDir(this.logDirectory);
+        await fs2__default.default.ensureDir(this.logDirectory);
         const timestamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-").split("T");
         const dateStr = timestamp[0];
         const timeStr = timestamp[1].split("-")[0].substring(0, 6);
@@ -5092,7 +5107,7 @@ var init_logger = __esm({
         this.logFilePath = path3__namespace.default.join(this.logDirectory, logFileName);
         const header = `# Juno-Task TypeScript Log - Started ${(/* @__PURE__ */ new Date()).toISOString()}
 `;
-        await fs3__default.default.writeFile(this.logFilePath, header);
+        await fs2__default.default.writeFile(this.logFilePath, header);
       }
       /**
        * Format log message matching Python version format
@@ -5110,7 +5125,7 @@ var init_logger = __esm({
         if (!this.logFilePath) {
           throw new Error("Logger not initialized. Call initialize() first.");
         }
-        await fs3__default.default.appendFile(this.logFilePath, message);
+        await fs2__default.default.appendFile(this.logFilePath, message);
       }
       /**
        * Log message at specified level
@@ -5396,8 +5411,8 @@ var init_terminal_progress_writer = __esm({
           this.options.stream.write("\r\x1B[K");
           if (typeof content === "string") {
             this.options.stream.write(content);
-            if (!content.endsWith("\n") && !content.endsWith(os3.EOL)) {
-              this.options.stream.write(os3.EOL);
+            if (!content.endsWith("\n") && !content.endsWith(os4.EOL)) {
+              this.options.stream.write(os4.EOL);
             }
           } else {
             console.error(content);
@@ -5405,8 +5420,8 @@ var init_terminal_progress_writer = __esm({
         } else {
           if (typeof content === "string") {
             this.options.stream.write(content);
-            if (!content.endsWith("\n") && !content.endsWith(os3.EOL)) {
-              this.options.stream.write(os3.EOL);
+            if (!content.endsWith("\n") && !content.endsWith(os4.EOL)) {
+              this.options.stream.write(os4.EOL);
             }
           } else {
             console.error(content);
@@ -6014,7 +6029,7 @@ var init_client = __esm({
             `${serverName}`,
             // Assume it's in PATH
             `/usr/local/bin/${serverName}`,
-            path3__namespace.default.resolve(os3__namespace.default.homedir(), `.local/bin/${serverName}`),
+            path3__namespace.default.resolve(os4__namespace.default.homedir(), `.local/bin/${serverName}`),
             path3__namespace.default.resolve(this.options.workingDirectory || process.cwd(), `${serverName}`)
           ];
           for (const serverPath of possiblePaths) {
@@ -7023,7 +7038,7 @@ var init_shell_backend = __esm({
         });
         try {
           const scriptPath = await this.findScriptForSubagent(subagentType);
-          const result = await this.executeScript(scriptPath, request, toolId);
+          const result = await this.executeScript(scriptPath, request, toolId, subagentType);
           const duration = Date.now() - startTime;
           await this.emitProgressEvent({
             sessionId: request.metadata?.sessionId || "unknown",
@@ -7040,8 +7055,9 @@ var init_shell_backend = __esm({
               phase: "completion"
             }
           });
+          const structuredResult = this.buildStructuredOutput(subagentType, result);
           return {
-            content: result.output,
+            content: structuredResult.content,
             status: result.success ? "completed" : "failed",
             startTime: new Date(startTime),
             endTime: /* @__PURE__ */ new Date(),
@@ -7049,6 +7065,7 @@ var init_shell_backend = __esm({
             error: result.error ? { type: "shell_execution", message: result.error, timestamp: /* @__PURE__ */ new Date() } : void 0,
             progressEvents: [],
             // Progress events are handled via callbacks
+            ...structuredResult.metadata ? { metadata: structuredResult.metadata } : void 0,
             request
           };
         } catch (error) {
@@ -7119,7 +7136,7 @@ var init_shell_backend = __esm({
         const timestamp = now.getFullYear().toString() + (now.getMonth() + 1).toString().padStart(2, "0") + now.getDate().toString().padStart(2, "0") + "_" + now.getHours().toString().padStart(2, "0") + now.getMinutes().toString().padStart(2, "0") + now.getSeconds().toString().padStart(2, "0");
         const logDir = path3__namespace.join(this.config.workingDirectory, ".juno_task", "logs");
         try {
-          await fs3__default.default.ensureDir(logDir);
+          await fs2__default.default.ensureDir(logDir);
         } catch (error) {
           if (this.config?.debug) {
             engineLogger.warn(`Failed to create log directory: ${error instanceof Error ? error.message : String(error)}`);
@@ -7144,7 +7161,7 @@ var init_shell_backend = __esm({
           const timestamp = (/* @__PURE__ */ new Date()).toISOString();
           const logEntry = `[${timestamp}] ${message}
 `;
-          await fs3__default.default.appendFile(this.logFilePath, logEntry, "utf-8");
+          await fs2__default.default.appendFile(this.logFilePath, logEntry, "utf-8");
         } catch (error) {
           if (this.config?.debug) {
             engineLogger.warn(`Failed to write to log file: ${error instanceof Error ? error.message : String(error)}`);
@@ -7214,8 +7231,8 @@ var init_shell_backend = __esm({
       /**
        * Execute a shell script
        */
-      async executeScript(scriptPath, request, toolId) {
-        return new Promise((resolve9, reject) => {
+      async executeScript(scriptPath, request, toolId, subagentType) {
+        return new Promise(async (resolve9, reject) => {
           const startTime = Date.now();
           const isPython = scriptPath.endsWith(".py");
           const env2 = {
@@ -7228,6 +7245,19 @@ var init_shell_backend = __esm({
             JUNO_ITERATION: String(request.arguments?.iteration || 1),
             JUNO_TOOL_ID: toolId
           };
+          let captureDir = null;
+          let capturePath = null;
+          if (subagentType === "claude") {
+            try {
+              captureDir = await nodeFs.promises.mkdtemp(path3__namespace.join(os4__namespace.default.tmpdir(), "juno-shell-"));
+              capturePath = path3__namespace.join(captureDir, `subagent_${toolId}.json`);
+              env2.JUNO_SUBAGENT_CAPTURE_PATH = capturePath;
+            } catch (error) {
+              if (this.config?.debug) {
+                engineLogger.warn(`Failed to prepare subagent capture path: ${error instanceof Error ? error.message : String(error)}`);
+              }
+            }
+          }
           const command = isPython ? "python3" : "bash";
           const args = [scriptPath];
           if (isPython && request.arguments?.instruction) {
@@ -7302,20 +7332,46 @@ var init_shell_backend = __esm({
             }
           });
           child.on("close", (exitCode) => {
-            if (isProcessKilled) return;
-            const duration = Date.now() - startTime;
-            const success = exitCode === 0;
-            if (this.config.debug) {
-              engineLogger.debug(`Script execution completed with exit code: ${exitCode}, duration: ${duration}ms`);
-              engineLogger.debug(`Stdout length: ${stdout2.length}, Stderr length: ${stderr.length}`);
-            }
-            resolve9({
-              success,
-              output: stdout2,
-              error: stderr || void 0,
-              exitCode: exitCode || 0,
-              duration
-            });
+            void (async () => {
+              if (isProcessKilled) return;
+              const duration = Date.now() - startTime;
+              const success = exitCode === 0;
+              let subAgentResponse;
+              if (capturePath) {
+                try {
+                  const captured = await nodeFs.promises.readFile(capturePath, "utf-8");
+                  if (captured.trim()) {
+                    subAgentResponse = JSON.parse(captured);
+                  }
+                } catch (error) {
+                  if (this.config?.debug) {
+                    engineLogger.warn(`Failed to read subagent capture: ${error instanceof Error ? error.message : String(error)}`);
+                  }
+                } finally {
+                  if (captureDir) {
+                    try {
+                      await nodeFs.promises.rm(captureDir, { recursive: true, force: true });
+                    } catch (cleanupError) {
+                      if (this.config?.debug) {
+                        engineLogger.warn(`Failed to clean capture directory: ${cleanupError instanceof Error ? cleanupError.message : String(cleanupError)}`);
+                      }
+                    }
+                  }
+                }
+              }
+              if (this.config.debug) {
+                engineLogger.debug(`Script execution completed with exit code: ${exitCode}, duration: ${duration}ms`);
+                engineLogger.debug(`Stdout length: ${stdout2.length}, Stderr length: ${stderr.length}`);
+              }
+              resolve9({
+                success,
+                output: stdout2,
+                error: stderr || void 0,
+                exitCode: exitCode || 0,
+                duration,
+                ...subAgentResponse ? { subAgentResponse } : void 0
+              });
+            })();
           });
           child.on("error", (error) => {
             if (isProcessKilled) return;
@@ -7347,6 +7403,66 @@ var init_shell_backend = __esm({
           });
         });
       }
+      /**
+       * Build a structured, JSON-parsable result payload for programmatic capture while
+       * preserving the shell backend's existing on-screen streaming behavior.
+       */
+      buildStructuredOutput(subagentType, result) {
+        if (subagentType === "claude") {
+          const claudeEvent = result.subAgentResponse ?? this.extractLastJsonEvent(result.output);
+          const isError = claudeEvent?.is_error ?? claudeEvent?.subtype === "error" ?? !result.success;
+          const structuredPayload = {
+            type: "result",
+            subtype: claudeEvent?.subtype || (isError ? "error" : "success"),
+            is_error: isError,
+            result: claudeEvent?.result ?? claudeEvent?.error ?? claudeEvent?.content ?? result.output,
+            error: claudeEvent?.error,
+            stderr: result.error,
+            datetime: claudeEvent?.datetime,
+            counter: claudeEvent?.counter,
+            session_id: claudeEvent?.session_id,
+            num_turns: claudeEvent?.num_turns,
+            duration_ms: claudeEvent?.duration_ms ?? result.duration,
+            exit_code: result.exitCode,
+            total_cost_usd: claudeEvent?.total_cost_usd,
+            usage: claudeEvent?.usage,
+            modelUsage: claudeEvent?.modelUsage || claudeEvent?.model_usage || {},
+            permission_denials: claudeEvent?.permission_denials || [],
+            uuid: claudeEvent?.uuid,
+            sub_agent_response: claudeEvent
+          };
+          const metadata = {
+            ...claudeEvent ? { subAgentResponse: claudeEvent } : void 0,
+            structuredOutput: true,
+            contentType: "application/json",
+            rawOutput: result.output
+          };
+          return {
+            content: JSON.stringify(structuredPayload),
+            metadata
+          };
+        }
+        return { content: result.output, metadata: result.metadata };
+      }
+      /**
+       * Extract the last valid JSON object from a script's stdout to use as a structured payload fallback.
+       */
+      extractLastJsonEvent(output) {
+        if (!output) {
+          return null;
+        }
+        const lines = output.split("\n").map((line) => line.trim()).filter(Boolean);
+        for (let i = lines.length - 1; i >= 0; i--) {
+          try {
+            const parsed = JSON.parse(lines[i]);
+            if (parsed && typeof parsed === "object") {
+              return parsed;
+            }
+          } catch {
+          }
+        }
+        return null;
+      }
       /**
        * Parse streaming events from script output
        * Handles both JSON format (Claude) and TEXT format (Codex)
@@ -7871,7 +7987,7 @@ var init_concurrent_feedback_collector = __esm({
         process.stdin.removeAllListeners("data");
         process.stdin.removeAllListeners("end");
         if (this.options.verbose) {
-          process.stderr.write(`${os3.EOL}[feedback-collector] Stopped. Total submissions: ${this.submissionCount}${os3.EOL}`);
+          process.stderr.write(`${os4.EOL}[feedback-collector] Stopped. Total submissions: ${this.submissionCount}${os4.EOL}`);
         }
       }
       /**
@@ -7934,7 +8050,7 @@ var init_concurrent_feedback_collector = __esm({
             chalk15__default.default.blue.bold("\u2551") + chalk15__default.default.gray("  Exit: Press Ctrl-D (or Ctrl-Z on Windows)") + " ".repeat(16) + chalk15__default.default.blue.bold("\u2551"),
             chalk15__default.default.blue.bold("\u255A" + border + "\u255D"),
             chalk15__default.default.cyan.bold("> ") + chalk15__default.default.gray("(Type F+Enter to start giving feedback)")
-          ].join(os3.EOL) + os3.EOL
+          ].join(os4.EOL) + os4.EOL
         );
       }
       /**
@@ -7944,7 +8060,7 @@ var init_concurrent_feedback_collector = __esm({
         this.progressTimer = setInterval(() => {
           this.progressTick += 1;
           const elapsed = ((Date.now() - this.startTime.getTime()) / 1e3).toFixed(1);
-          process.stderr.write(`[progress] tick=${this.progressTick} elapsed=${elapsed}s${os3.EOL}`);
+          process.stderr.write(`[progress] tick=${this.progressTick} elapsed=${elapsed}s${os4.EOL}`);
         }, this.options.progressInterval);
       }
       /**
@@ -7954,10 +8070,10 @@ var init_concurrent_feedback_collector = __esm({
         this.feedbackMode = "feedback" /* FEEDBACK */;
         setFeedbackActive(true);
         this.buffer = "";
-        process.stdout.write(os3.EOL + chalk15__default.default.yellow.bold("\u{1F4DD} FEEDBACK MODE") + chalk15__default.default.gray(" - Type feedback (multiline ok), then Q+Enter to submit | MCP progress paused") + os3.EOL);
+        process.stdout.write(os4.EOL + chalk15__default.default.yellow.bold("\u{1F4DD} FEEDBACK MODE") + chalk15__default.default.gray(" - Type feedback (multiline ok), then Q+Enter to submit | MCP progress paused") + os4.EOL);
         process.stdout.write(chalk15__default.default.cyan.bold("> "));
         if (this.options.verbose) {
-          process.stderr.write(`[feedback-collector] Entered FEEDBACK mode - MCP progress buffering activated${os3.EOL}`);
+          process.stderr.write(`[feedback-collector] Entered FEEDBACK mode - MCP progress buffering activated${os4.EOL}`);
         }
       }
       /**
@@ -7967,7 +8083,7 @@ var init_concurrent_feedback_collector = __esm({
         this.feedbackMode = "normal" /* NORMAL */;
         setFeedbackActive(false);
         if (this.options.verbose) {
-          process.stderr.write(`[feedback-collector] Exited FEEDBACK mode - MCP progress restored${os3.EOL}`);
+          process.stderr.write(`[feedback-collector] Exited FEEDBACK mode - MCP progress restored${os4.EOL}`);
         }
       }
       /**
@@ -8010,7 +8126,7 @@ var init_concurrent_feedback_collector = __esm({
             clearInterval(this.progressTimer);
           }
           if (this.options.verbose) {
-            process.stderr.write(`${os3.EOL}[feedback-collector] EOF received. Total submissions: ${this.submissionCount}${os3.EOL}`);
+            process.stderr.write(`${os4.EOL}[feedback-collector] EOF received. Total submissions: ${this.submissionCount}${os4.EOL}`);
           }
         });
       }
@@ -8025,7 +8141,7 @@ var init_concurrent_feedback_collector = __esm({
             return;
           }
           if (trimmed.length > 0) {
-            process.stdout.write(chalk15__default.default.gray("Type F+Enter to enter feedback mode, or Ctrl-D to exit") + os3.EOL);
+            process.stdout.write(chalk15__default.default.gray("Type F+Enter to enter feedback mode, or Ctrl-D to exit") + os4.EOL);
             process.stdout.write(chalk15__default.default.cyan.bold("> "));
           }
           return;
@@ -8034,10 +8150,10 @@ var init_concurrent_feedback_collector = __esm({
           if (trimmed === "q") {
             this.submitFeedback();
             this.exitFeedbackMode();
-            process.stdout.write(os3.EOL + chalk15__default.default.cyan.bold("> ") + chalk15__default.default.gray("(Type F+Enter for another feedback, or Ctrl-D to exit)") + os3.EOL);
+            process.stdout.write(os4.EOL + chalk15__default.default.cyan.bold("> ") + chalk15__default.default.gray("(Type F+Enter for another feedback, or Ctrl-D to exit)") + os4.EOL);
             return;
           }
-          this.buffer += line + os3.EOL;
+          this.buffer += line + os4.EOL;
         }
       }
       /**
@@ -8047,18 +8163,18 @@ var init_concurrent_feedback_collector = __esm({
         const content = this.buffer.trimEnd();
         this.buffer = "";
         if (content.length === 0) {
-          process.stdout.write(os3.EOL + chalk15__default.default.yellow("\u26A0\uFE0F  No feedback content to submit") + os3.EOL);
+          process.stdout.write(os4.EOL + chalk15__default.default.yellow("\u26A0\uFE0F  No feedback content to submit") + os4.EOL);
           return;
         }
-        process.stdout.write(os3.EOL + chalk15__default.default.green.bold("\u2705 Feedback registered and being processed...") + os3.EOL);
+        process.stdout.write(os4.EOL + chalk15__default.default.green.bold("\u2705 Feedback registered and being processed...") + os4.EOL);
         if (this.options.verbose) {
-          process.stdout.write(chalk15__default.default.gray("Feedback content:") + os3.EOL);
-          process.stdout.write(content + os3.EOL);
-          process.stdout.write(chalk15__default.default.cyan("===== END BLOCK =====") + os3.EOL);
+          process.stdout.write(chalk15__default.default.gray("Feedback content:") + os4.EOL);
+          process.stdout.write(content + os4.EOL);
+          process.stdout.write(chalk15__default.default.cyan("===== END BLOCK =====") + os4.EOL);
         }
         flushBufferedProgress();
         this.enqueueSubmission(content).catch((err) => {
-          process.stderr.write(`${os3.EOL}[feedback-collector] Error submitting feedback: ${err}${os3.EOL}`);
+          process.stderr.write(`${os4.EOL}[feedback-collector] Error submitting feedback: ${err}${os4.EOL}`);
         });
       }
       /**
@@ -8084,18 +8200,18 @@ var init_concurrent_feedback_collector = __esm({
         this.submissions.push(submission);
         if (this.options.onSubmit) {
           if (this.options.verbose) {
-            process.stderr.write(`${os3.EOL}[feedback-collector ${n}] Using custom submission handler${os3.EOL}`);
+            process.stderr.write(`${os4.EOL}[feedback-collector ${n}] Using custom submission handler${os4.EOL}`);
           }
           try {
             await this.options.onSubmit(input);
             if (this.options.verbose) {
-              process.stderr.write(`[feedback-collector ${n}] Custom handler completed${os3.EOL}`);
+              process.stderr.write(`[feedback-collector ${n}] Custom handler completed${os4.EOL}`);
             }
-            process.stdout.write(os3.EOL + chalk15__default.default.green("\u2705 Feedback submitted successfully. You can type another block.") + os3.EOL);
-            process.stdout.write(os3.EOL + chalk15__default.default.cyan.bold("> ") + chalk15__default.default.gray("(Ready for next feedback)") + os3.EOL);
+            process.stdout.write(os4.EOL + chalk15__default.default.green("\u2705 Feedback submitted successfully. You can type another block.") + os4.EOL);
+            process.stdout.write(os4.EOL + chalk15__default.default.cyan.bold("> ") + chalk15__default.default.gray("(Ready for next feedback)") + os4.EOL);
           } catch (error) {
-            process.stderr.write(`[feedback-collector ${n}] Custom handler error: ${error}${os3.EOL}`);
-            process.stdout.write(os3.EOL + chalk15__default.default.red("\u274C Feedback submission failed. Please try again.") + os3.EOL);
+            process.stderr.write(`[feedback-collector ${n}] Custom handler error: ${error}${os4.EOL}`);
+            process.stdout.write(os4.EOL + chalk15__default.default.red("\u274C Feedback submission failed. Please try again.") + os4.EOL);
           }
         } else {
           await this.runCommandWithInput(n, input);
@@ -8106,7 +8222,7 @@ var init_concurrent_feedback_collector = __esm({
        */
       async runCommandWithInput(n, input) {
         if (this.options.verbose) {
-          process.stderr.write(`${os3.EOL}[feedback-collector ${n}] Launching "${this.options.command}" ${this.options.commandArgs.join(" ")}${os3.EOL}`);
+          process.stderr.write(`${os4.EOL}[feedback-collector ${n}] Launching "${this.options.command}" ${this.options.commandArgs.join(" ")}${os4.EOL}`);
         }
         return new Promise((resolve9) => {
           const child = child_process.spawn(this.options.command, this.options.commandArgs, {
@@ -8124,25 +8240,25 @@ var init_concurrent_feedback_collector = __esm({
           });
           child.on("close", (code) => {
             if (this.options.verbose) {
-              process.stderr.write(`[feedback-collector ${n}] exit code ${code ?? 0}${os3.EOL}`);
+              process.stderr.write(`[feedback-collector ${n}] exit code ${code ?? 0}${os4.EOL}`);
             }
             if (code === 0) {
-              process.stdout.write(os3.EOL + chalk15__default.default.green("\u2705 Feedback submitted successfully. You can type another block.") + os3.EOL);
-              process.stdout.write(os3.EOL + chalk15__default.default.cyan.bold("> ") + chalk15__default.default.gray("(Ready for next feedback)") + os3.EOL);
+              process.stdout.write(os4.EOL + chalk15__default.default.green("\u2705 Feedback submitted successfully. You can type another block.") + os4.EOL);
+              process.stdout.write(os4.EOL + chalk15__default.default.cyan.bold("> ") + chalk15__default.default.gray("(Ready for next feedback)") + os4.EOL);
             } else {
-              process.stdout.write(os3.EOL + chalk15__default.default.red("\u274C Feedback submission failed. Please try again.") + os3.EOL);
+              process.stdout.write(os4.EOL + chalk15__default.default.red("\u274C Feedback submission failed. Please try again.") + os4.EOL);
             }
             resolve9();
           });
           child.on("error", (err) => {
-            process.stderr.write(`[feedback-collector ${n}] error: ${err.message}${os3.EOL}`);
-            process.stdout.write(os3.EOL + chalk15__default.default.red("\u274C Feedback submission failed. Please try again.") + os3.EOL);
+            process.stderr.write(`[feedback-collector ${n}] error: ${err.message}${os4.EOL}`);
+            process.stdout.write(os4.EOL + chalk15__default.default.red("\u274C Feedback submission failed. Please try again.") + os4.EOL);
             resolve9();
           });
           if (child.stdin) {
             child.stdin.write(input);
-            if (!input.endsWith(os3.EOL)) {
-              child.stdin.write(os3.EOL);
+            if (!input.endsWith(os4.EOL)) {
+              child.stdin.write(os4.EOL);
             }
             child.stdin.end();
           }
@@ -12843,7 +12959,7 @@ var init_main = __esm({
             return await this.collectInteractivePrompt();
           } else {
             const defaultPromptPath = path3__namespace.join(process.cwd(), ".juno_task", "prompt.md");
-            if (await fs3__default.default.pathExists(defaultPromptPath)) {
+            if (await fs2__default.default.pathExists(defaultPromptPath)) {
               console.error(chalk15__default.default.blue(`\u{1F4C4} Using default prompt: ${chalk15__default.default.cyan(".juno_task/prompt.md")}`));
               return await this.loadPromptFromFile(defaultPromptPath);
             } else {
@@ -12871,7 +12987,7 @@ var init_main = __esm({
         }
         try {
           const resolvedPath = path3__namespace.resolve(prompt);
-          return await fs3__default.default.pathExists(resolvedPath);
+          return await fs2__default.default.pathExists(resolvedPath);
         } catch {
           return false;
         }
@@ -12879,7 +12995,7 @@ var init_main = __esm({
       async loadPromptFromFile(filePath) {
         try {
           const resolvedPath = path3__namespace.resolve(filePath);
-          const content = await fs3__default.default.readFile(resolvedPath, "utf-8");
+          const content = await fs2__default.default.readFile(resolvedPath, "utf-8");
           if (!content.trim()) {
             throw new FileSystemError(
               "Prompt file is empty",
@@ -13086,7 +13202,11 @@ var init_main = __esm({
 \u274C Execution failed (${elapsed})`));
         }
         const lastIteration = result.iterations[result.iterations.length - 1];
-        if (lastIteration && lastIteration.toolResult.content && !this.hasStreamedJsonOutput) {
+        const structuredOutput = lastIteration?.toolResult.metadata?.structuredOutput === true;
+        const shouldPrintResult = Boolean(
+          lastIteration && lastIteration.toolResult.content && (!this.hasStreamedJsonOutput || structuredOutput)
+        );
+        if (shouldPrintResult) {
           console.error(chalk15__default.default.blue("\n\u{1F4C4} Result:"));
           console.log(lastIteration.toolResult.content);
         }
@@ -13287,7 +13407,7 @@ async function validateJSONFile(configSchema, baseDir) {
   const warnings = [];
   const filePath = path3__namespace.default.join(baseDir, configSchema.file);
   try {
-    const exists = await fs3__default.default.pathExists(filePath);
+    const exists = await fs2__default.default.pathExists(filePath);
     if (!exists) {
       if (configSchema.required) {
         errors.push({
@@ -13310,7 +13430,7 @@ async function validateJSONFile(configSchema, baseDir) {
       return { isValid: !configSchema.required, errors, warnings };
     }
     try {
-      await fs3__default.default.access(filePath, fs3__default.default.constants.R_OK);
+      await fs2__default.default.access(filePath, fs2__default.default.constants.R_OK);
     } catch (accessError) {
       errors.push({
         file: configSchema.file,
@@ -13326,7 +13446,7 @@ async function validateJSONFile(configSchema, baseDir) {
     }
     let jsonData;
     try {
-      const fileContent = await fs3__default.default.readFile(filePath, "utf8");
+      const fileContent = await fs2__default.default.readFile(filePath, "utf8");
       jsonData = JSON.parse(fileContent);
     } catch (parseError) {
       const errorMessage = parseError instanceof Error ? parseError.message : String(parseError);
@@ -13424,7 +13544,7 @@ async function validateJSONConfigs(baseDir = process.cwd(), backendType = "mcp")
 }
 function displayValidationResults(result) {
   if (result.isValid && result.warnings.length === 0) {
-    console.log(chalk15__default.default.green("\u2705 All configuration files are valid\n"));
+    console.error(chalk15__default.default.green("\u2705 All configuration files are valid\n"));
     return;
   }
   if (result.errors.length > 0) {
@@ -13461,7 +13581,7 @@ function displayValidationResults(result) {
 }
 async function logValidationResults(result, baseDir = process.cwd()) {
   const logDir = path3__namespace.default.join(baseDir, ".juno_task", "logs");
-  await fs3__default.default.ensureDir(logDir);
+  await fs2__default.default.ensureDir(logDir);
   const timestamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
   const logFile = path3__namespace.default.join(logDir, `startup-validation-${timestamp}.log`);
   const logContent = [
@@ -13504,7 +13624,7 @@ async function logValidationResults(result, baseDir = process.cwd()) {
       logContent.push(``);
     }
   }
-  await fs3__default.default.writeFile(logFile, logContent.join("\n"));
+  await fs2__default.default.writeFile(logFile, logContent.join("\n"));
   return logFile;
 }
 async function validateStartupConfigs(baseDir = process.cwd(), verbose = false) {
@@ -13838,7 +13958,7 @@ var TemplateEngine = class {
     let overallError;
     try {
       if (!options.dryRun) {
-        await fs3__default.default.ensureDir(targetDirectory);
+        await fs2__default.default.ensureDir(targetDirectory);
       }
       for (const template of templates) {
         try {
@@ -15188,7 +15308,7 @@ This directory contains specification documents for your project.
     const fileName = this.getTemplateFileName(template);
     const targetPath = path3__namespace.join(targetDirectory, fileName);
     try {
-      const fileExists = await fs3__default.default.pathExists(targetPath);
+      const fileExists = await fs2__default.default.pathExists(targetPath);
       if (fileExists && !options.force && options.onConflict !== "overwrite") {
         return {
           path: targetPath,
@@ -15210,10 +15330,10 @@ This directory contains specification documents for your project.
       }
       if (options.createBackup && fileExists) {
         const backupPath = `${targetPath}.backup.${Date.now()}`;
-        await fs3__default.default.copy(targetPath, backupPath);
+        await fs2__default.default.copy(targetPath, backupPath);
       }
-      await fs3__default.default.ensureDir(path3__namespace.dirname(targetPath));
-      await fs3__default.default.writeFile(targetPath, renderedContent, "utf8");
+      await fs2__default.default.ensureDir(path3__namespace.dirname(targetPath));
+      await fs2__default.default.writeFile(targetPath, renderedContent, "utf8");
       return {
         path: targetPath,
         content: renderedContent,
@@ -15477,7 +15597,7 @@ var SimpleInitTUI = class {
   }
   async confirmSave(targetDirectory) {
     const junoTaskPath = path3__namespace.join(targetDirectory, ".juno_task");
-    if (await fs3__default.default.pathExists(junoTaskPath)) {
+    if (await fs2__default.default.pathExists(junoTaskPath)) {
       console.log(chalk15__default.default.yellow("   \u26A0\uFE0F  .juno_task directory already exists"));
       console.log(chalk15__default.default.gray("   Would you like to:"));
       console.log(chalk15__default.default.gray("   1) Override existing files"));
@@ -15522,16 +15642,16 @@ var SimpleProjectGenerator = class {
   async generate() {
     const { targetDirectory, variables, force } = this.context;
     console.log(chalk15__default.default.blue("\u{1F4C1} Creating project directory..."));
-    await fs3__default.default.ensureDir(targetDirectory);
+    await fs2__default.default.ensureDir(targetDirectory);
     const junoTaskDir = path3__namespace.join(targetDirectory, ".juno_task");
-    const junoTaskExists = await fs3__default.default.pathExists(junoTaskDir);
+    const junoTaskExists = await fs2__default.default.pathExists(junoTaskDir);
     if (junoTaskExists && !force) {
       throw new ValidationError(
         "Project already initialized. Directory .juno_task already exists.",
         ["Use --force flag to overwrite existing files", "Choose a different directory"]
       );
     }
-    await fs3__default.default.ensureDir(junoTaskDir);
+    await fs2__default.default.ensureDir(junoTaskDir);
     console.log(chalk15__default.default.blue("\u2699\uFE0F Creating project configuration..."));
     await this.createConfigFile(junoTaskDir, targetDirectory);
     console.log(chalk15__default.default.blue("\u{1F527} Setting up MCP configuration..."));
@@ -15565,21 +15685,21 @@ var SimpleProjectGenerator = class {
     const promptContent = await templateEngine.render(promptTemplate, templateContext);
     const initContent = await templateEngine.render(initTemplate, templateContext);
     const implementContent = await templateEngine.render(implementTemplate, templateContext);
-    await fs3__default.default.writeFile(path3__namespace.join(junoTaskDir, "prompt.md"), promptContent);
-    await fs3__default.default.writeFile(path3__namespace.join(junoTaskDir, "init.md"), initContent);
-    await fs3__default.default.writeFile(path3__namespace.join(junoTaskDir, "implement.md"), implementContent);
+    await fs2__default.default.writeFile(path3__namespace.join(junoTaskDir, "prompt.md"), promptContent);
+    await fs2__default.default.writeFile(path3__namespace.join(junoTaskDir, "init.md"), initContent);
+    await fs2__default.default.writeFile(path3__namespace.join(junoTaskDir, "implement.md"), implementContent);
     const userFeedbackTemplate = templateEngine.getBuiltInTemplate("USER_FEEDBACK.md");
     if (userFeedbackTemplate) {
       const userFeedbackContent = await templateEngine.render(userFeedbackTemplate, templateContext);
-      await fs3__default.default.writeFile(path3__namespace.join(junoTaskDir, "USER_FEEDBACK.md"), userFeedbackContent);
+      await fs2__default.default.writeFile(path3__namespace.join(junoTaskDir, "USER_FEEDBACK.md"), userFeedbackContent);
     }
     const planTemplate = templateEngine.getBuiltInTemplate("plan.md");
     if (planTemplate) {
       const planContent = await templateEngine.render(planTemplate, templateContext);
-      await fs3__default.default.writeFile(path3__namespace.join(junoTaskDir, "plan.md"), planContent);
+      await fs2__default.default.writeFile(path3__namespace.join(junoTaskDir, "plan.md"), planContent);
     }
     const specsDir = path3__namespace.join(junoTaskDir, "specs");
-    await fs3__default.default.ensureDir(specsDir);
+    await fs2__default.default.ensureDir(specsDir);
     const specsReadmeContent = `# Project Specifications
 
 This directory contains detailed specifications for the project components.
@@ -15596,7 +15716,7 @@ This directory contains detailed specifications for the project components.
 - Avoid conflicts with existing file names
 - Use \`.md\` extension for all specification files
 `;
-    await fs3__default.default.writeFile(path3__namespace.join(specsDir, "README.md"), specsReadmeContent);
+    await fs2__default.default.writeFile(path3__namespace.join(specsDir, "README.md"), specsReadmeContent);
     const requirementsContent = `# Requirements Specification
 
 ## Functional Requirements
@@ -15643,7 +15763,7 @@ This directory contains detailed specifications for the project components.
 - Code quality: Clean, maintainable codebase
 - Documentation: Complete and accurate documentation
 `;
-    await fs3__default.default.writeFile(path3__namespace.join(specsDir, "requirements.md"), requirementsContent);
+    await fs2__default.default.writeFile(path3__namespace.join(specsDir, "requirements.md"), requirementsContent);
     const architectureContent = `# Architecture Specification
 
 ## System Overview
@@ -15725,7 +15845,7 @@ This project uses AI-assisted development with juno-code to achieve: ${variables
 - Performance monitoring
 - Security best practices
 `;
-    await fs3__default.default.writeFile(path3__namespace.join(specsDir, "architecture.md"), architectureContent);
+    await fs2__default.default.writeFile(path3__namespace.join(specsDir, "architecture.md"), architectureContent);
     const claudeContent = `# Claude Development Session Learnings
 
 ## Project Overview
@@ -15797,7 +15917,7 @@ This file will be updated as development progresses to track:
 - Solutions to complex problems
 - Performance improvements and optimizations
 `;
-    await fs3__default.default.writeFile(path3__namespace.join(targetDirectory, "CLAUDE.md"), claudeContent);
+    await fs2__default.default.writeFile(path3__namespace.join(targetDirectory, "CLAUDE.md"), claudeContent);
     const agentsContent = `# AI Agent Selection and Performance
 
 ## Available Agents
@@ -15861,7 +15981,7 @@ Track agent performance for:
 4. **Feedback Loop**: Provide feedback to improve agent performance
 5. **Performance Monitoring**: Track and optimize agent usage
 `;
-    await fs3__default.default.writeFile(path3__namespace.join(targetDirectory, "AGENTS.md"), agentsContent);
+    await fs2__default.default.writeFile(path3__namespace.join(targetDirectory, "AGENTS.md"), agentsContent);
     const readmeContent = `# ${variables.PROJECT_NAME}
 
 ${variables.DESCRIPTION}
@@ -15958,7 +16078,7 @@ ${variables.GIT_URL}` : ""}
 Created with juno-code on ${variables.CURRENT_DATE}
 ${variables.EDITOR ? `using ${variables.EDITOR} as primary AI subagent` : ""}
 `;
-    await fs3__default.default.writeFile(path3__namespace.join(targetDirectory, "README.md"), readmeContent);
+    await fs2__default.default.writeFile(path3__namespace.join(targetDirectory, "README.md"), readmeContent);
     console.log(chalk15__default.default.blue("\u{1F4E6} Installing utility scripts..."));
     await this.copyScriptsFromTemplates(junoTaskDir);
     console.log(chalk15__default.default.blue("\u{1F40D} Installing Python requirements..."));
@@ -16010,7 +16130,7 @@ ${variables.EDITOR ? `using ${variables.EDITOR} as primary AI subagent` : ""}
       hooks: getDefaultHooks()
     };
     const configPath = path3__namespace.join(junoTaskDir, "config.json");
-    await fs3__default.default.writeFile(configPath, JSON.stringify(configContent, null, 2));
+    await fs2__default.default.writeFile(configPath, JSON.stringify(configContent, null, 2));
     console.log(chalk15__default.default.green(`   \u2713 Created .juno_task/config.json with ${this.context.subagent} as default subagent`));
   }
   async createMcpFile(junoTaskDir, targetDirectory) {
@@ -16064,7 +16184,7 @@ ${variables.EDITOR ? `using ${variables.EDITOR} as primary AI subagent` : ""}
       }
     };
     const mcpPath = path3__namespace.join(junoTaskDir, "mcp.json");
-    await fs3__default.default.writeFile(mcpPath, JSON.stringify(mcpContent, null, 2));
+    await fs2__default.default.writeFile(mcpPath, JSON.stringify(mcpContent, null, 2));
     console.log(chalk15__default.default.green(`   \u2713 Created .juno_task/mcp.json with roundtable-ai server configuration`));
   }
   getDefaultModelForSubagent(subagent) {
@@ -16083,7 +16203,7 @@ ${variables.EDITOR ? `using ${variables.EDITOR} as primary AI subagent` : ""}
   async copyScriptsFromTemplates(junoTaskDir) {
     try {
       const scriptsDir = path3__namespace.join(junoTaskDir, "scripts");
-      await fs3__default.default.ensureDir(scriptsDir);
+      await fs2__default.default.ensureDir(scriptsDir);
       const __filename2 = url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('cli.js', document.baseURI).href)));
       const __dirname2 = path3__namespace.dirname(__filename2);
       let templatesScriptsDir;
@@ -16094,11 +16214,11 @@ ${variables.EDITOR ? `using ${variables.EDITOR} as primary AI subagent` : ""}
       } else {
         templatesScriptsDir = path3__namespace.join(__dirname2, "../../templates/scripts");
       }
-      if (!await fs3__default.default.pathExists(templatesScriptsDir)) {
+      if (!await fs2__default.default.pathExists(templatesScriptsDir)) {
         console.log(chalk15__default.default.yellow("   \u26A0\uFE0F  Template scripts directory not found, skipping script installation"));
         return;
       }
-      const scriptFiles = await fs3__default.default.readdir(templatesScriptsDir);
+      const scriptFiles = await fs2__default.default.readdir(templatesScriptsDir);
       if (scriptFiles.length === 0) {
         console.log(chalk15__default.default.gray("   \u2139\uFE0F  No template scripts found to install"));
         return;
@@ -16107,11 +16227,11 @@ ${variables.EDITOR ? `using ${variables.EDITOR} as primary AI subagent` : ""}
       for (const scriptFile of scriptFiles) {
         const sourcePath = path3__namespace.join(templatesScriptsDir, scriptFile);
         const destPath = path3__namespace.join(scriptsDir, scriptFile);
-        const stats = await fs3__default.default.stat(sourcePath);
+        const stats = await fs2__default.default.stat(sourcePath);
         if (stats.isFile()) {
-          await fs3__default.default.copy(sourcePath, destPath);
+          await fs2__default.default.copy(sourcePath, destPath);
           if (scriptFile.endsWith(".sh")) {
-            await fs3__default.default.chmod(destPath, 493);
+            await fs2__default.default.chmod(destPath, 493);
           }
           copiedCount++;
           console.log(chalk15__default.default.green(`   \u2713 Installed script: ${scriptFile}`));
@@ -16134,7 +16254,7 @@ ${variables.EDITOR ? `using ${variables.EDITOR} as primary AI subagent` : ""}
     try {
       const scriptsDir = path3__namespace.join(junoTaskDir, "scripts");
       const installScript = path3__namespace.join(scriptsDir, "install_requirements.sh");
-      if (!await fs3__default.default.pathExists(installScript)) {
+      if (!await fs2__default.default.pathExists(installScript)) {
         console.log(chalk15__default.default.yellow("   \u26A0\uFE0F  install_requirements.sh not found, skipping Python dependencies installation"));
         console.log(chalk15__default.default.gray("   You can install dependencies manually: juno-kanban, roundtable-ai"));
         return;
@@ -16431,20 +16551,20 @@ init_types();
 async function loadInitPrompt(directory) {
   const junoTaskDir = path3__namespace.join(directory, ".juno_task");
   const initFile = path3__namespace.join(junoTaskDir, "init.md");
-  if (!await fs3__default.default.pathExists(junoTaskDir)) {
+  if (!await fs2__default.default.pathExists(junoTaskDir)) {
     throw new FileSystemError(
       'No .juno_task directory found. Run "juno-code init" first.',
       junoTaskDir
     );
   }
-  if (!await fs3__default.default.pathExists(initFile)) {
+  if (!await fs2__default.default.pathExists(initFile)) {
     throw new FileSystemError(
       "No init.md file found in .juno_task directory",
       initFile
     );
   }
   try {
-    const content = await fs3__default.default.readFile(initFile, "utf-8");
+    const content = await fs2__default.default.readFile(initFile, "utf-8");
     if (!content.trim()) {
       throw new FileSystemError(
         "init.md file is empty. Please add task instructions.",
@@ -17476,8 +17596,8 @@ Focus on ${request.intelligence === "basic" ? "basic functionality" : request.in
     for (const scenario of scenarios) {
       const testContent = await this.generateTestContent(request, scenario, template);
       const testFilePath = this.resolveTestFilePath(request, scenario);
-      await fs3__default.default.ensureDir(path3__namespace.dirname(testFilePath));
-      await fs3__default.default.writeFile(testFilePath, testContent);
+      await fs2__default.default.ensureDir(path3__namespace.dirname(testFilePath));
+      await fs2__default.default.writeFile(testFilePath, testContent);
       testFiles.push(testFilePath);
     }
     return testFiles;
@@ -17729,8 +17849,8 @@ var TestExecutionEngine = class {
   async collectCoverage(request) {
     const coverageFile = path3__namespace.join(request.workingDirectory, "coverage", "coverage-summary.json");
     try {
-      if (await fs3__default.default.pathExists(coverageFile)) {
-        const coverageData = await fs3__default.default.readJson(coverageFile);
+      if (await fs2__default.default.pathExists(coverageFile)) {
+        const coverageData = await fs2__default.default.readJson(coverageFile);
         return {
           lines: coverageData.total?.lines?.pct || 0,
           functions: coverageData.total?.functions?.pct || 0,
@@ -17913,8 +18033,8 @@ var TestReportEngine = class {
       suggestions: analysis.suggestions,
       recommendations: analysis.recommendations
     };
-    await fs3__default.default.ensureDir(path3__namespace.dirname(outputPath));
-    await fs3__default.default.writeJson(outputPath, report, { spaces: 2 });
+    await fs2__default.default.ensureDir(path3__namespace.dirname(outputPath));
+    await fs2__default.default.writeJson(outputPath, report, { spaces: 2 });
     return outputPath;
   }
   async generateHTMLReport(analysis, outputPath, includeVisualizations) {
@@ -17977,8 +18097,8 @@ var TestReportEngine = class {
 </body>
 </html>
     `.trim();
-    await fs3__default.default.ensureDir(path3__namespace.dirname(outputPath));
-    await fs3__default.default.writeFile(outputPath, html);
+    await fs2__default.default.ensureDir(path3__namespace.dirname(outputPath));
+    await fs2__default.default.writeFile(outputPath, html);
     return outputPath;
   }
   generateCharts(analysis) {
@@ -18035,8 +18155,8 @@ ${analysis.suggestions.map((suggestion) => `- ${suggestion}`).join("\n")}
 
 ${analysis.recommendations.map((rec) => `- ${rec}`).join("\n")}
     `.trim();
-    await fs3__default.default.ensureDir(path3__namespace.dirname(outputPath));
-    await fs3__default.default.writeFile(outputPath, markdown);
+    await fs2__default.default.ensureDir(path3__namespace.dirname(outputPath));
+    await fs2__default.default.writeFile(outputPath, markdown);
     return outputPath;
   }
   async displayConsoleReport(analysis) {
@@ -18376,7 +18496,7 @@ async function compactConfigFile(filePath, options = {}) {
     preserveDays = 30,
     preservePatterns = []
   } = options;
-  const originalContent = await fs3__default.default.readFile(filePath, "utf-8");
+  const originalContent = await fs2__default.default.readFile(filePath, "utf-8");
   const originalSize = originalContent.length;
   let backupPath = "";
   if (createBackup && !dryRun) {
@@ -18385,7 +18505,7 @@ async function compactConfigFile(filePath, options = {}) {
     const basename11 = path3__namespace.basename(filePath, ext);
     const dirname12 = path3__namespace.dirname(filePath);
     backupPath = path3__namespace.join(dirname12, `${basename11}.backup.${timestamp}${ext}`);
-    await fs3__default.default.writeFile(backupPath, originalContent, "utf-8");
+    await fs2__default.default.writeFile(backupPath, originalContent, "utf-8");
   }
   const compactionAnalysis = analyzeMarkdownStructure(originalContent);
   const compactedContent = compactMarkdownContent(
@@ -18400,7 +18520,7 @@ async function compactConfigFile(filePath, options = {}) {
   const compactedSize = finalContent.length;
   const reductionPercentage = Math.round((originalSize - compactedSize) / originalSize * 100);
   if (!dryRun) {
-    await fs3__default.default.writeFile(filePath, finalContent, "utf-8");
+    await fs2__default.default.writeFile(filePath, finalContent, "utf-8");
   }
   return {
     originalSize,
@@ -18530,7 +18650,7 @@ function formatFileSize(bytes) {
 }
 async function shouldCompactFile(filePath, sizeThresholdKB = 50, ageThresholdDays = 30) {
   try {
-    const stats = await fs3__default.default.stat(filePath);
+    const stats = await fs2__default.default.stat(filePath);
     const sizeKB = stats.size / 1024;
     if (sizeKB > sizeThresholdKB) {
       return true;
@@ -18552,19 +18672,19 @@ async function archiveResolvedIssues(options) {
     feedbackFile,
     archiveDir = path3__namespace.join(path3__namespace.dirname(feedbackFile), "archives"),
     openIssuesThreshold = 10} = options;
-  if (!await fs3__default.default.pathExists(feedbackFile)) {
+  if (!await fs2__default.default.pathExists(feedbackFile)) {
     throw new Error(`Feedback file does not exist: ${feedbackFile}`);
   }
-  const content = await fs3__default.default.readFile(feedbackFile, "utf-8");
+  const content = await fs2__default.default.readFile(feedbackFile, "utf-8");
   const parsed = parseUserFeedback(content);
   const warningsGenerated = [];
   if (parsed.openIssues.length > openIssuesThreshold) {
     const warning = `Found ${parsed.openIssues.length} open issues (threshold: ${openIssuesThreshold}). Consider reviewing and prioritizing.`;
     warningsGenerated.push(warning);
     const logFile = path3__namespace.join(path3__namespace.dirname(feedbackFile), "logs", "feedback-warnings.log");
-    await fs3__default.default.ensureDir(path3__namespace.dirname(logFile));
+    await fs2__default.default.ensureDir(path3__namespace.dirname(logFile));
     const timestamp = (/* @__PURE__ */ new Date()).toISOString();
-    await fs3__default.default.appendFile(logFile, `[${timestamp}] ${warning}
+    await fs2__default.default.appendFile(logFile, `[${timestamp}] ${warning}
 `);
   }
   if (parsed.resolvedIssues.length === 0) {
@@ -18581,10 +18701,10 @@ async function archiveResolvedIssues(options) {
   const currentYear = (/* @__PURE__ */ new Date()).getFullYear();
   const archiveFile = path3__namespace.join(archiveDir, `USER_FEEDBACK_archive_${currentYear}.md`);
   {
-    await fs3__default.default.ensureDir(archiveDir);
+    await fs2__default.default.ensureDir(archiveDir);
     await appendToArchive(archiveFile, parsed.resolvedIssues);
     const compactedContent = generateCompactedFeedback(parsed.openIssues, parsed.metadata);
-    await fs3__default.default.writeFile(feedbackFile, compactedContent, "utf-8");
+    await fs2__default.default.writeFile(feedbackFile, compactedContent, "utf-8");
   }
   {
     console.log(chalk15__default.default.green(`\u2705 Archived ${parsed.resolvedIssues.length} resolved issues`));
@@ -18631,8 +18751,8 @@ function parseUserFeedback(content) {
 async function appendToArchive(archiveFile, resolvedIssues) {
   const timestamp = (/* @__PURE__ */ new Date()).toISOString().split("T")[0];
   let archiveContent = "";
-  if (await fs3__default.default.pathExists(archiveFile)) {
-    archiveContent = await fs3__default.default.readFile(archiveFile, "utf-8");
+  if (await fs2__default.default.pathExists(archiveFile)) {
+    archiveContent = await fs2__default.default.readFile(archiveFile, "utf-8");
   } else {
     const year = path3__namespace.basename(archiveFile).match(/(\d{4})/)?.[1] || (/* @__PURE__ */ new Date()).getFullYear();
     archiveContent = `# User Feedback Archive ${year}
@@ -18666,7 +18786,7 @@ ${resolvedIssue}
       `- Last updated: ${timestamp}`
     );
   }
-  await fs3__default.default.writeFile(archiveFile, archiveContent, "utf-8");
+  await fs2__default.default.writeFile(archiveFile, archiveContent, "utf-8");
 }
 function generateCompactedFeedback(openIssues, metadata) {
   let content = metadata.trim() + "\n";
@@ -18691,15 +18811,15 @@ async function shouldArchive(feedbackFile, options = {}) {
     // 50KB
     lineCountThreshold = 500
   } = options;
-  if (!await fs3__default.default.pathExists(feedbackFile)) {
+  if (!await fs2__default.default.pathExists(feedbackFile)) {
     return {
       shouldArchive: false,
       reasons: [],
       stats: { openIssuesCount: 0, resolvedIssuesCount: 0, fileSizeBytes: 0, lineCount: 0 }
     };
   }
-  const content = await fs3__default.default.readFile(feedbackFile, "utf-8");
-  const stats = await fs3__default.default.stat(feedbackFile);
+  const content = await fs2__default.default.readFile(feedbackFile, "utf-8");
+  const stats = await fs2__default.default.stat(feedbackFile);
   const parsed = parseUserFeedback(content);
   const lineCount = content.split("\n").length;
   const reasons = [];
@@ -18773,16 +18893,16 @@ var EnhancedFeedbackFileManager = class {
     this.feedbackFile = feedbackFile;
   }
   async ensureExists() {
-    if (!await fs3__default.default.pathExists(this.feedbackFile)) {
+    if (!await fs2__default.default.pathExists(this.feedbackFile)) {
       await this.createInitialFile();
     }
   }
   async addFeedback(issue, testCriteria) {
     await this.ensureExists();
     try {
-      const content = await fs3__default.default.readFile(this.feedbackFile, "utf-8");
+      const content = await fs2__default.default.readFile(this.feedbackFile, "utf-8");
       const updatedContent = this.addIssueToContent(content, issue, testCriteria);
-      await fs3__default.default.writeFile(this.feedbackFile, updatedContent, "utf-8");
+      await fs2__default.default.writeFile(this.feedbackFile, updatedContent, "utf-8");
     } catch (error) {
       throw new ValidationError(
         `Failed to save feedback: ${error}`,
@@ -18795,12 +18915,12 @@ var EnhancedFeedbackFileManager = class {
    */
   async repairMalformedFile() {
     try {
-      const content = await fs3__default.default.readFile(this.feedbackFile, "utf-8");
+      const content = await fs2__default.default.readFile(this.feedbackFile, "utf-8");
       const hasOpenIssues = content.includes("<OPEN_ISSUES>");
       const hasClosingTag = content.includes("</OPEN_ISSUES>");
       if (!hasOpenIssues || !hasClosingTag) {
         const backupPath = this.feedbackFile + ".backup." + Date.now();
-        await fs3__default.default.writeFile(backupPath, content, "utf-8");
+        await fs2__default.default.writeFile(backupPath, content, "utf-8");
         const existingIssues = this.extractIssuesFromMalformedContent(content);
         await this.createInitialFile(existingIssues);
       }
@@ -18832,8 +18952,8 @@ List any features you'd like to see added or bugs you've encountered.
 
 <!-- Resolved issues will be moved here -->
 `;
-    await fs3__default.default.ensureDir(path3__namespace.dirname(this.feedbackFile));
-    await fs3__default.default.writeFile(this.feedbackFile, initialContent, "utf-8");
+    await fs2__default.default.ensureDir(path3__namespace.dirname(this.feedbackFile));
+    await fs2__default.default.writeFile(this.feedbackFile, initialContent, "utf-8");
   }
   addIssueToContent(content, issue, testCriteria) {
     const timestamp = (/* @__PURE__ */ new Date()).toISOString().split("T")[0];
@@ -18949,17 +19069,17 @@ async function handleCompactCommand(subArgs, options) {
     if (subArgs.length > 0) {
       for (const filePath of subArgs) {
         const resolvedPath = path3__namespace.resolve(filePath);
-        if (await fs3__default.default.pathExists(resolvedPath)) {
+        if (await fs2__default.default.pathExists(resolvedPath)) {
           filesToCompact.push(resolvedPath);
         } else {
           console.warn(chalk15__default.default.yellow(`\u26A0\uFE0F  File not found: ${filePath}`));
         }
       }
     } else {
-      if (await fs3__default.default.pathExists(defaultClaudeFile)) {
+      if (await fs2__default.default.pathExists(defaultClaudeFile)) {
         filesToCompact.push(defaultClaudeFile);
       }
-      if (await fs3__default.default.pathExists(defaultAgentsFile)) {
+      if (await fs2__default.default.pathExists(defaultAgentsFile)) {
         filesToCompact.push(defaultAgentsFile);
       }
     }
@@ -19893,11 +20013,11 @@ var GitManager = class {
    */
   async updateJunoTaskConfig(gitUrl) {
     const configPath = path3__namespace.join(this.workingDirectory, ".juno_task", "init.md");
-    if (!await fs3__default.default.pathExists(configPath)) {
+    if (!await fs2__default.default.pathExists(configPath)) {
       return;
     }
     try {
-      let content = await fs3__default.default.readFile(configPath, "utf-8");
+      let content = await fs2__default.default.readFile(configPath, "utf-8");
       const frontmatterMatch = content.match(/^---\n([\s\S]*?)\n---/);
       if (frontmatterMatch) {
         let frontmatter = frontmatterMatch[1];
@@ -19918,7 +20038,7 @@ GIT_URL: ${gitUrl}
 `;
         content = frontmatter + content;
       }
-      await fs3__default.default.writeFile(configPath, content, "utf-8");
+      await fs2__default.default.writeFile(configPath, content, "utf-8");
     } catch (error) {
       console.warn(`Warning: Failed to update juno-code configuration: ${error}`);
     }
@@ -21850,6 +21970,11 @@ var QUICK_REFERENCE = [
         description: "Shell completion setup",
         usage: "juno-code completion <install|uninstall>"
       },
+      {
+        name: "services",
+        description: "Manage service scripts (use --force to refresh codex.py/claude.py)",
+        usage: "juno-code services install --force"
+      },
       {
         name: "help",
         description: "Show help information",
@@ -22418,11 +22543,12 @@ init_service_installer();
 function createServicesCommand() {
   const servicesCmd = new commander.Command("services").description("Manage juno-code service scripts").addHelpText("after", `
 Examples:
-  $ juno-code services install       Install service scripts to ~/.juno_code/services/
-  $ juno-code services list          List installed service scripts
-  $ juno-code services status        Check installation status
-  $ juno-code services uninstall     Remove all service scripts
-  $ juno-code services path          Show services directory path
+  $ juno-code services install            Install service scripts to ~/.juno_code/services/
+  $ juno-code services install --force    Reinstall/refresh service scripts (codex.py/claude.py)
+  $ juno-code services list               List installed service scripts
+  $ juno-code services status             Check installation status
+  $ juno-code services uninstall          Remove all service scripts
+  $ juno-code services path               Show services directory path
 
 Service scripts are Python/shell scripts that provide additional functionality
 and can be customized by users. They are installed to ~/.juno_code/services/
@@ -22596,7 +22722,7 @@ var ShellDetector = class _ShellDetector {
    * Get shell configuration file path
    */
   getConfigPath(shell) {
-    const homeDir = os3__namespace.homedir();
+    const homeDir = os4__namespace.homedir();
     switch (shell) {
       case "bash":
         if (process.platform === "darwin") {
@@ -22620,7 +22746,7 @@ var ShellDetector = class _ShellDetector {
    * Get shell completion script installation path
    */
   getCompletionPath(shell) {
-    const homeDir = os3__namespace.homedir();
+    const homeDir = os4__namespace.homedir();
     switch (shell) {
       case "bash":
         if (process.platform === "darwin") {
@@ -22675,10 +22801,10 @@ autoload -U compinit && compinit`;
    */
   async isSourceCommandPresent(configPath, sourceCommand) {
     try {
-      if (!await fs3__default.default.pathExists(configPath)) {
+      if (!await fs2__default.default.pathExists(configPath)) {
         return false;
       }
-      const content = await fs3__default.default.readFile(configPath, "utf-8");
+      const content = await fs2__default.default.readFile(configPath, "utf-8");
       return content.includes("juno-code completion");
     } catch {
       return false;
@@ -22700,15 +22826,15 @@ autoload -U compinit && compinit`;
         continue;
       }
       try {
-        const completionExists = await fs3__default.default.pathExists(shell.completionPath);
-        const configExists = await fs3__default.default.pathExists(shell.configPath);
+        const completionExists = await fs2__default.default.pathExists(shell.completionPath);
+        const configExists = await fs2__default.default.pathExists(shell.configPath);
         const isSourced = configExists && await this.isSourceCommandPresent(
           shell.configPath,
           this.getSourceCommand(shell.name, shell.completionPath)
         );
         let lastInstalled;
         if (completionExists) {
-          const stats = await fs3__default.default.stat(shell.completionPath);
+          const stats = await fs2__default.default.stat(shell.completionPath);
           lastInstalled = stats.mtime;
         }
         statuses.push({
@@ -22734,7 +22860,7 @@ autoload -U compinit && compinit`;
   async ensureCompletionDirectory(shell) {
     const completionPath = this.getCompletionPath(shell);
     const completionDir = path3__namespace.dirname(completionPath);
-    await fs3__default.default.ensureDir(completionDir);
+    await fs2__default.default.ensureDir(completionDir);
   }
   /**
    * Ensure directory exists for shell configuration
@@ -22742,7 +22868,7 @@ autoload -U compinit && compinit`;
   async ensureConfigDirectory(shell) {
     const configPath = this.getConfigPath(shell);
     const configDir = path3__namespace.dirname(configPath);
-    await fs3__default.default.ensureDir(configDir);
+    await fs2__default.default.ensureDir(configDir);
   }
   /**
    * Get shell version information
@@ -22766,15 +22892,15 @@ autoload -U compinit && compinit`;
     try {
       const configPath = this.getConfigPath(shell);
       const configDir = path3__namespace.dirname(configPath);
-      await fs3__default.default.access(configDir, fs3__default.default.constants.W_OK);
+      await fs2__default.default.access(configDir, fs2__default.default.constants.W_OK);
     } catch {
       issues.push(`Cannot write to ${shell} configuration directory`);
     }
     try {
       const completionPath = this.getCompletionPath(shell);
       const completionDir = path3__namespace.dirname(completionPath);
-      await fs3__default.default.ensureDir(completionDir);
-      await fs3__default.default.access(completionDir, fs3__default.default.constants.W_OK);
+      await fs2__default.default.ensureDir(completionDir);
+      await fs2__default.default.access(completionDir, fs2__default.default.constants.W_OK);
     } catch {
       issues.push(`Cannot write to ${shell} completion directory`);
     }
@@ -22845,10 +22971,10 @@ var ContextAwareCompletion = class {
   async getSessionIds() {
     try {
       const sessionDir = path3__namespace.join(process.cwd(), ".juno_task", "sessions");
-      if (!await fs3__default.default.pathExists(sessionDir)) {
+      if (!await fs2__default.default.pathExists(sessionDir)) {
         return [];
       }
-      const sessions = await fs3__default.default.readdir(sessionDir);
+      const sessions = await fs2__default.default.readdir(sessionDir);
       return sessions.filter((name) => name.match(/^session_\d+$/)).map((name) => name.replace("session_", "")).sort((a, b) => parseInt(b) - parseInt(a));
     } catch {
       return [];
@@ -22862,8 +22988,8 @@ var ContextAwareCompletion = class {
       const builtinTemplates = ["basic", "advanced", "research", "development"];
       const customTemplatesDir = path3__namespace.join(process.cwd(), ".juno_task", "templates");
       let customTemplates = [];
-      if (await fs3__default.default.pathExists(customTemplatesDir)) {
-        const files = await fs3__default.default.readdir(customTemplatesDir);
+      if (await fs2__default.default.pathExists(customTemplatesDir)) {
+        const files = await fs2__default.default.readdir(customTemplatesDir);
         customTemplates = files.filter((name) => name.endsWith(".md") || name.endsWith(".hbs")).map((name) => path3__namespace.basename(name, path3__namespace.extname(name)));
       }
       return [...builtinTemplates, ...customTemplates].sort();
@@ -22898,7 +23024,7 @@ var ContextAwareCompletion = class {
    */
   expandPath(inputPath) {
     if (inputPath.startsWith("~/")) {
-      return path3__namespace.join(os3__namespace.homedir(), inputPath.slice(2));
+      return path3__namespace.join(os4__namespace.homedir(), inputPath.slice(2));
     }
     if (inputPath.startsWith("./") || inputPath.startsWith("../")) {
       return path3__namespace.resolve(inputPath);
@@ -22940,7 +23066,7 @@ var CompletionInstaller = class {
       await this.shellDetector.ensureConfigDirectory(shell);
       const script = this.generateEnhancedCompletion(shell, "juno-code");
       const completionPath = this.shellDetector.getCompletionPath(shell);
-      await fs3__default.default.writeFile(completionPath, script, "utf-8");
+      await fs2__default.default.writeFile(completionPath, script, "utf-8");
       const configPath = this.shellDetector.getConfigPath(shell);
       const sourceCommand = this.shellDetector.getSourceCommand(shell, completionPath);
       const warnings = [];
@@ -22948,7 +23074,7 @@ var CompletionInstaller = class {
         const isPresent = await this.shellDetector.isSourceCommandPresent(configPath, sourceCommand);
         if (!isPresent) {
           try {
-            await fs3__default.default.appendFile(configPath, `
+            await fs2__default.default.appendFile(configPath, `
 
 ${sourceCommand}
 `);
@@ -22979,8 +23105,8 @@ ${sourceCommand}
   async uninstall(shell) {
     try {
       const completionPath = this.shellDetector.getCompletionPath(shell);
-      if (await fs3__default.default.pathExists(completionPath)) {
-        await fs3__default.default.remove(completionPath);
+      if (await fs2__default.default.pathExists(completionPath)) {
+        await fs2__default.default.remove(completionPath);
         return true;
       }
       return false;
@@ -22994,7 +23120,7 @@ ${sourceCommand}
   async isInstalled(shell) {
     try {
       const completionPath = this.shellDetector.getCompletionPath(shell);
-      return await fs3__default.default.pathExists(completionPath);
+      return await fs2__default.default.pathExists(completionPath);
     } catch {
       return false;
     }