@adhdev/daemon-core 0.7.15 → 0.7.17

package/dist/index.mjs

@@ -1346,31 +1346,14 @@ var init_provider_cli_adapter = __esm({
         this.accumulatedRawBuffer = (this.accumulatedRawBuffer + rawData).slice(-_ProviderCliAdapter.MAX_ACCUMULATED_BUFFER);
         if (this.startupParseGate) {
           this.startupBuffer += cleanData;
-          const dialogPatterns = [
-            /Do you want to connect/i,
-            /Do you trust the files/i,
-            /Quick safety check/i,
-            /Is this a project/i,
-            /Enter to confirm/i,
-            /be able to read, edit, and execute/i,
-            /Security guide/i
-          ];
-          if (dialogPatterns.some((p) => p.test(this.startupBuffer))) {
-            setTimeout(() => this.ptyProcess?.write("\r"), this.timeouts.dialogAccept);
-            this.startupBuffer = "";
-            return;
-          }
           const elapsed = Date.now() - this.spawnAt;
-          const bufCap = this.startupBuffer.length > 12e3;
           const scriptStatus = this.runDetectStatus(this.startupBuffer);
-          const isReady = scriptStatus === "idle" || elapsed > 8e3 || bufCap;
+          const isReady = scriptStatus === "idle" || scriptStatus === "waiting_approval" || elapsed > 8e3 || this.startupBuffer.length > 12e3;
           if (isReady) {
             this.startupParseGate = false;
             this.ready = true;
-            LOG.info("CLI", `[${this.cliType}] Startup gate end (${elapsed}ms, scriptStatus=${scriptStatus})`);
+            LOG.info("CLI", `[${this.cliType}] Startup ready (${elapsed}ms, scriptStatus=${scriptStatus})`);
             this.onStatusChange?.();
-          } else {
-            return;
           }
         }
         this.scheduleSettle();
@@ -1578,51 +1561,6 @@ var init_provider_cli_adapter = __esm({
         this.onStatusChange?.();
       }
       commitCurrentTranscript() {
-        const baseMessages = [...this.committedMessages];
-        const parsed = this.parseCurrentTranscript(baseMessages, "", this.currentTurnScope);
-        if (parsed && Array.isArray(parsed.messages) && parsed.messages.length > 0) {
-          const parsedMessages = parsed.messages.filter((m) => m && (m.role === "user" || m.role === "assistant")).map((m) => ({
-            role: m.role,
-            content: typeof m.content === "string" ? m.content : String(m.content || ""),
-            timestamp: m.timestamp
-          }));
-          const latestAssistant = [...parsedMessages].reverse().find((m) => m.role === "assistant" && m.content.trim());
-          if (latestAssistant) {
-            LOG.info("CLI", `[${this.cliType}] commitCurrentTranscript parsed assistant len=${latestAssistant.content.length} scopePrompt=${JSON.stringify(this.currentTurnScope?.prompt || "").slice(0, 120)}`);
-            const nextMessages = [...baseMessages];
-            const last2 = nextMessages[nextMessages.length - 1];
-            if (last2?.role === "assistant") {
-              last2.content = latestAssistant.content;
-              last2.timestamp = latestAssistant.timestamp || last2.timestamp;
-            } else if (last2?.role === "user") {
-              nextMessages.push({
-                role: "assistant",
-                content: latestAssistant.content,
-                timestamp: latestAssistant.timestamp || Date.now()
-              });
-            } else {
-              nextMessages.push({
-                role: "assistant",
-                content: latestAssistant.content,
-                timestamp: latestAssistant.timestamp || Date.now()
-              });
-            }
-            this.committedMessages = nextMessages;
-            this.syncMessageViews();
-            return;
-          }
-        }
-        const fallback = String(this.responseBuffer || "").trim();
-        LOG.info("CLI", `[${this.cliType}] commitCurrentTranscript fallback len=${fallback.length} scopePrompt=${JSON.stringify(this.currentTurnScope?.prompt || "").slice(0, 120)}`);
-        if (!fallback) return;
-        const last = baseMessages[baseMessages.length - 1];
-        if (last?.role === "assistant") {
-          last.content = fallback;
-        } else {
-          baseMessages.push({ role: "assistant", content: fallback, timestamp: Date.now() });
-        }
-        this.committedMessages = baseMessages;
-        this.syncMessageViews();
       }
       // ─── Script Execution ──────────────────────────
       runDetectStatus(text) {
@@ -10073,6 +10011,11 @@ var AcpProviderInstance = class {
 
 // src/commands/cli-manager.ts
 init_logger();
+var chalkApi = chalk?.yellow ? chalk : chalk?.default || null;
+function colorize(color, text) {
+  const fn = chalkApi?.[color];
+  return typeof fn === "function" ? fn(text) : text;
+}
 var DaemonCliManager = class {
   adapters = /* @__PURE__ */ new Map();
   deps;
@@ -10092,16 +10035,16 @@ var DaemonCliManager = class {
       const provider = this.providerLoader.getByAlias(cliType);
       const actKind = provider?.category === "acp" ? "acp" : "cli";
       let next = loadConfig();
-      console.log(chalk.cyan(`  \u{1F4C2} Saving recent workspace: ${dir}`));
+      console.log(colorize("cyan", `  \u{1F4C2} Saving recent workspace: ${dir}`));
       const recent = next.recentCliWorkspaces || [];
       if (!recent.includes(dir)) {
         next = { ...next, recentCliWorkspaces: [dir, ...recent].slice(0, 10) };
       }
       next = appendWorkspaceActivity(next, dir, { kind: actKind, agentType: normalizedType });
       saveConfig(next);
-      console.log(chalk.green(`  \u2713 Recent workspace saved: ${dir}`));
+      console.log(colorize("green", `  \u2713 Recent workspace saved: ${dir}`));
     } catch (e) {
-      console.error(chalk.red(`  \u2717 Failed to save recent workspace: ${e}`));
+      console.error(colorize("red", `  \u2717 Failed to save recent workspace: ${e}`));
     }
   }
   getTransportFactory(runtimeId, providerType, workspace, cliArgs, attachExisting = false) {
@@ -10117,7 +10060,7 @@ var DaemonCliManager = class {
     const normalizedType = this.providerLoader.resolveAlias(cliType);
     const provider = this.providerLoader.getMeta(normalizedType);
     if (provider && provider.category === "cli" && provider.patterns && provider.spawn) {
-      console.log(chalk.cyan(`  \u{1F4E6} Using provider: ${provider.name} (${provider.type})`));
+      console.log(colorize("cyan", `  \u{1F4E6} Using provider: ${provider.name} (${provider.type})`));
       const resolvedProvider = this.providerLoader.resolve(normalizedType) || provider;
       const transportFactory = this.getTransportFactory(runtimeId, normalizedType, workingDir, cliArgs, attachExisting);
       return new ProviderCliAdapter(resolvedProvider, workingDir, cliArgs, transportFactory);
@@ -10210,7 +10153,7 @@ ${installInfo}`
           );
         }
       }
-      console.log(chalk.cyan(`  \u{1F50C} Starting ACP agent: ${provider.name} (${provider.type}) in ${resolvedDir}`));
+      console.log(colorize("cyan", `  \u{1F50C} Starting ACP agent: ${provider.name} (${provider.type}) in ${resolvedDir}`));
       const acpInstance = new AcpProviderInstance(provider, resolvedDir, cliArgs);
       await instanceManager2.addInstance(key, acpInstance, {
         settings: this.providerLoader.getSettings(normalizedType)
@@ -10250,11 +10193,11 @@ ${installInfo}`
         setOnPtyData: () => {
         }
       });
-      console.log(chalk.green(`  \u2713 ACP agent started: ${provider.name} in ${resolvedDir}`));
+      console.log(colorize("green", `  \u2713 ACP agent started: ${provider.name} in ${resolvedDir}`));
       if (initialModel) {
         try {
           await acpInstance.setConfigOption("model", initialModel);
-          console.log(chalk.green(`  \u{1F916} Initial model set: ${initialModel}`));
+          console.log(colorize("green", `  \u{1F916} Initial model set: ${initialModel}`));
         } catch (e) {
           LOG.warn("CLI", `[ACP] Initial model set failed: ${e?.message}`);
         }
@@ -10269,9 +10212,9 @@ ${installInfo}`
     }
     const cliInfo = await detectCLI(cliType, this.providerLoader);
     if (!cliInfo) throw new Error(`${cliType} not found`);
-    console.log(chalk.yellow(`  \u26A1 Starting CLI ${cliType} in ${resolvedDir}...`));
+    console.log(colorize("yellow", `  \u26A1 Starting CLI ${cliType} in ${resolvedDir}...`));
     if (provider) {
-      console.log(chalk.cyan(`  \u{1F4E6} Using provider: ${provider.name} (${provider.type})`));
+      console.log(colorize("cyan", `  \u{1F4E6} Using provider: ${provider.name} (${provider.type})`));
     }
     const instanceManager = this.deps.getInstanceManager();
     if (provider && instanceManager) {
@@ -10286,7 +10229,7 @@ ${installInfo}`
         {},
         false
       );
-      console.log(chalk.green(`  \u2713 CLI started: ${cliInfo.displayName} v${cliInfo.version || "unknown"} in ${resolvedDir}`));
+      console.log(colorize("green", `  \u2713 CLI started: ${cliInfo.displayName} v${cliInfo.version || "unknown"} in ${resolvedDir}`));
     } else {
       const adapter = this.createAdapter(cliType, resolvedDir, cliArgs, key, false);
       try {
@@ -10319,7 +10262,7 @@ ${installInfo}`
         });
       }
       this.adapters.set(key, adapter);
-      console.log(chalk.green(`  \u2713 CLI started: ${cliInfo.displayName} v${cliInfo.version || "unknown"} in ${resolvedDir}`));
+      console.log(colorize("green", `  \u2713 CLI started: ${cliInfo.displayName} v${cliInfo.version || "unknown"} in ${resolvedDir}`));
     }
     try {
       addCliHistory({ category: "cli", cliType, dir: resolvedDir, workspace: resolvedDir, cliArgs, model: initialModel });
@@ -10481,7 +10424,7 @@ ${installInfo}`
         if (found) {
           await this.stopSessionWithMode(found.key, mode);
         } else {
-          console.log(chalk.yellow(`  \u26A0 No adapter found for ${cliType}`));
+          console.log(colorize("yellow", `  \u26A0 No adapter found for ${cliType}`));
         }
         return { success: true, cliType, dir, stopped: true, mode };
       }