@adhdev/daemon-core 0.7.40 → 0.7.41

package/dist/commands/cli-manager.d.ts

@@ -46,6 +46,7 @@ export interface HostedCliRuntimeDescriptor {
     cliType: string;
     workspace: string;
     cliArgs?: string[];
+    launchMode?: string;
 }
 export declare class DaemonCliManager {
     readonly adapters: Map<string, CliAdapter>;
@@ -58,7 +59,7 @@ export declare class DaemonCliManager {
     private createAdapter;
     private startCliExitMonitor;
     private registerCliInstance;
-    startSession(cliType: string, workingDir: string, cliArgs?: string[], initialModel?: string): Promise<void>;
+    startSession(cliType: string, workingDir: string, cliArgs?: string[], initialModel?: string, launchMode?: string, launchOptionValues?: Record<string, string | boolean | number>): Promise<void>;
     stopSession(key: string): Promise<void>;
     stopSessionWithMode(key: string, mode: 'hard' | 'save'): Promise<void>;
     shutdownAll(): void;

package/dist/index.js

@@ -5068,6 +5068,8 @@ function buildCliSession(state) {
     runtimeWorkspaceLabel: state.runtime?.workspaceLabel,
     runtimeWriteOwner: state.runtime?.writeOwner || null,
     runtimeAttachedClients: state.runtime?.attachedClients || [],
+    launchMode: state.launchMode,
+    mode: state.mode,
     resume: state.resume,
     activeChat,
     capabilities: PTY_SESSION_CAPABILITIES,
@@ -9145,12 +9147,14 @@ var crypto3 = __toESM(require("crypto"));
 init_provider_cli_adapter();
 init_logger();
 var CliProviderInstance = class {
-  constructor(provider, workingDir, cliArgs = [], instanceId, transportFactory) {
+  constructor(provider, workingDir, cliArgs = [], instanceId, transportFactory, launchModeId) {
     this.provider = provider;
     this.workingDir = workingDir;
     this.cliArgs = cliArgs;
     this.type = provider.type;
     this.instanceId = instanceId || crypto3.randomUUID();
+    this.launchMode = launchModeId && provider.launchModes?.find((m) => m.id === launchModeId) || null;
+    this.resolvedOutputFormat = this.resolveOutputFormat();
     this.adapter = new ProviderCliAdapter(provider, workingDir, cliArgs, transportFactory);
     this.monitor = new StatusMonitor();
     this.historyWriter = new ChatHistoryWriter();
@@ -9169,6 +9173,26 @@ var CliProviderInstance = class {
   lastApprovalEventAt = 0;
   historyWriter;
   instanceId;
+  launchMode;
+  resolvedOutputFormat;
+  /**
+   * Determine output rendering format from:
+   * 1. launchMode.outputFormat (explicit override)
+   * 2. launchOptions[].outputFormatMap — check actual args for matching values
+   * 3. Default: 'terminal'
+   */
+  resolveOutputFormat() {
+    if (this.launchMode?.outputFormat) return this.launchMode.outputFormat;
+    if (this.provider.launchOptions?.length) {
+      for (const opt of this.provider.launchOptions) {
+        if (!opt.outputFormatMap) continue;
+        for (const [val, fmt] of Object.entries(opt.outputFormatMap)) {
+          if (this.cliArgs.includes(val)) return fmt;
+        }
+      }
+    }
+    return "terminal";
+  }
   // ─── Lifecycle ─────────────────────────────────
   async init(context) {
     this.context = context;
@@ -9208,7 +9232,8 @@ var CliProviderInstance = class {
       name: this.provider.name,
       category: "cli",
       status: adapterStatus.status,
-      mode: "terminal",
+      mode: this.resolvedOutputFormat === "stream-json" ? "chat" : "terminal",
+      launchMode: this.launchMode?.id,
       activeChat: {
         id: `${this.type}_${this.workingDir}`,
         title: `${this.provider.name} \xB7 ${dirName}`,
@@ -10350,12 +10375,12 @@ var DaemonCliManager = class {
       }
     }, 3e3);
   }
-  async registerCliInstance(key, normalizedType, cliType, resolvedDir, cliArgs, provider, settings, attachExisting = false) {
+  async registerCliInstance(key, normalizedType, cliType, resolvedDir, cliArgs, provider, settings, attachExisting = false, launchModeId) {
     const instanceManager = this.deps.getInstanceManager();
     const sessionRegistry = this.deps.getSessionRegistry?.() || null;
     if (!instanceManager) throw new Error("InstanceManager not available");
     const transportFactory = this.getTransportFactory(key, normalizedType, resolvedDir, cliArgs, attachExisting);
-    const cliInstance = new CliProviderInstance(provider, resolvedDir, cliArgs, key, transportFactory);
+    const cliInstance = new CliProviderInstance(provider, resolvedDir, cliArgs, key, transportFactory, launchModeId);
     try {
       await instanceManager.addInstance(key, cliInstance, {
         serverConn: this.deps.getServerConn(),
@@ -10381,7 +10406,7 @@ var DaemonCliManager = class {
     this.startCliExitMonitor(key, cliType);
   }
   // ─── Session start/management ──────────────────────────────
-  async startSession(cliType, workingDir, cliArgs, initialModel) {
+  async startSession(cliType, workingDir, cliArgs, initialModel, launchMode, launchOptionValues) {
     const trimmed = (workingDir || "").trim();
     if (!trimmed) throw new Error("working directory required");
     const resolvedDir = trimmed.startsWith("~") ? trimmed.replace(/^~/, os13.homedir()) : path10.resolve(trimmed);
@@ -10473,6 +10498,29 @@ ${installInfo}`
     if (provider) {
       console.log(colorize("cyan", `  \u{1F4E6} Using provider: ${provider.name} (${provider.type})`));
     }
+    let resolvedCliArgs = cliArgs;
+    let resolvedLaunchMode = launchMode;
+    const activeMode = provider?.launchModes?.length ? launchMode ? provider.launchModes.find((m) => m.id === launchMode) : provider.launchModes.find((m) => m.default) : void 0;
+    if (activeMode) {
+      resolvedLaunchMode = activeMode.id;
+    }
+    if (provider?.launchArgBuilder) {
+      const defaults = {};
+      for (const opt of provider.launchOptions || []) {
+        if (opt.default !== void 0) defaults[opt.id] = opt.default;
+      }
+      const modeOptions = activeMode?.options || {};
+      const userOptions = launchOptionValues || {};
+      const merged = { ...defaults, ...modeOptions, ...userOptions };
+      const extraArgs = provider.launchArgBuilder(merged);
+      if (extraArgs.length) {
+        resolvedCliArgs = [...cliArgs || [], ...extraArgs];
+        console.log(colorize("cyan", `  \u{1F680} Launch options applied: ${extraArgs.join(" ")}`));
+      }
+    } else if (activeMode?.extraArgs?.length) {
+      resolvedCliArgs = [...cliArgs || [], ...activeMode.extraArgs];
+      console.log(colorize("cyan", `  \u{1F680} Launch mode '${activeMode.name}': appending args ${activeMode.extraArgs.join(" ")}`));
+    }
     const instanceManager = this.deps.getInstanceManager();
     if (provider && instanceManager) {
       const resolvedProvider = this.providerLoader.resolve(cliType, { version: cliInfo.version }) || provider;
@@ -10481,14 +10529,15 @@ ${installInfo}`
         normalizedType,
         cliType,
         resolvedDir,
-        cliArgs,
+        resolvedCliArgs,
         resolvedProvider,
         {},
-        false
+        false,
+        resolvedLaunchMode
       );
       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);
+      const adapter = this.createAdapter(cliType, resolvedDir, resolvedCliArgs, key, false);
       try {
         await adapter.spawn();
       } catch (spawnErr) {
@@ -10596,7 +10645,8 @@ ${installInfo}`
           record.cliArgs,
           resolvedProvider,
           {},
-          true
+          true,
+          record.launchMode
         );
         restored += 1;
         LOG.info("CLI", `\u267B Restored hosted runtime: ${record.runtimeKey || record.runtimeId} (${record.displayName || record.workspace})`);
@@ -10666,7 +10716,7 @@ ${installInfo}`
         const dir = resolved.path;
         const launchSource = resolved.source;
         if (!cliType) throw new Error("cliType required");
-        await this.startSession(cliType, dir, args?.cliArgs, args?.initialModel);
+        await this.startSession(cliType, dir, args?.cliArgs, args?.initialModel, args?.launchMode, args?.launchOptionValues);
         let newKey = null;
         for (const [k, adapter] of this.adapters) {
           if (adapter.cliType === cliType && adapter.workingDir === dir) {