@adhdev/daemon-core 0.6.55 → 0.6.56

package/src/daemon/dev-server.ts

@@ -2638,7 +2638,7 @@ export class DevServer {
     lines.push('| Function | Input | Return |');
     lines.push('|---|---|---|');
     lines.push('| `parseOutput` | `{ buffer, rawBuffer, recentBuffer, screenText, messages, partialResponse }` | `{ id, status, title, messages, activeModal }` |');
-    lines.push('| `detectStatus` | `{ tail }` | `idle`, `generating`, `waiting_approval`, or `error` |');
+    lines.push('| `detectStatus` | `{ tail, screenText, rawBuffer }` | `idle`, `generating`, `waiting_approval`, or `error` |');
     lines.push('| `parseApproval` | `{ buffer, rawBuffer, tail }` | `{ message, buttons }` or `null` |');
     lines.push('');
 
@@ -2652,6 +2652,7 @@ export class DevServer {
     lines.push('7. Use `rawBuffer` only when ANSI/control-sequence artifacts matter. Do not depend on raw escape noise unless necessary.');
     lines.push('8. Keep exports compatible with the existing `scripts.js` router (`module.exports = function ...`).');
     lines.push('9. Do not rewrite unrelated provider config. Only touch the scripts needed for this task unless a tiny supporting change is required.');
+    lines.push('10. When the verification API returns `instanceId`, keep using that exact instance for follow-up `send`, `resolve`, `raw`, and `stop` calls. Do not assume type-only routing is safe if multiple sessions exist.');
     lines.push('');
 
     lines.push('## Task');
@@ -2674,25 +2675,38 @@ export class DevServer {
     lines.push(`curl -sS http://127.0.0.1:${DEV_SERVER_PORT}/api/cli/status`);
     lines.push('```');
     lines.push('');
-    lines.push('### 3. Send a rich test prompt');
+    lines.push('Extract the current `instanceId` from the launch or status response and keep using it below.');
+    lines.push('');
+    lines.push('### 3. Send a realistic approval-triggering prompt');
     lines.push('```bash');
     lines.push(`curl -sS -X POST http://127.0.0.1:${DEV_SERVER_PORT}/api/cli/send \\`);
     lines.push('  -H "Content-Type: application/json" \\');
-    lines.push(`  -d '{"type":"${type}","text":"Write a short python snippet, include a markdown table, and briefly explain what you did."}'`);
+    lines.push(`  -d '{"type":"${type}","instanceId":"<INSTANCE_ID>","text":"Create a file at tmp/adhdev_provider_fix_test.py that prints the current working directory and the squares of 1 through 5, then run python3 tmp/adhdev_provider_fix_test.py and tell me the exact output."}'`);
     lines.push('```');
     lines.push('');
-    lines.push('### 4. If approval appears, resolve it');
+    lines.push('### 4. If approval appears, resolve it until the CLI reaches idle');
     lines.push('```bash');
     lines.push(`curl -sS -X POST http://127.0.0.1:${DEV_SERVER_PORT}/api/cli/resolve \\`);
     lines.push('  -H "Content-Type: application/json" \\');
-    lines.push(`  -d '{"type":"${type}","buttonIndex":0}'`);
+    lines.push(`  -d '{"type":"${type}","instanceId":"<INSTANCE_ID>","buttonIndex":0}'`);
+    lines.push(`curl -sS -X POST http://127.0.0.1:${DEV_SERVER_PORT}/api/cli/raw \\`);
+    lines.push('  -H "Content-Type: application/json" \\');
+    lines.push(`  -d '{"type":"${type}","instanceId":"<INSTANCE_ID>","keys":"1"}'`);
     lines.push('```');
     lines.push('');
-    lines.push('### 5. Stop the CLI when finished');
+    lines.push('Use `resolve` when the parsed modal buttons are correct. Use `raw` when the CLI expects a literal keystroke like `1`, `y`, or Enter. Repeat until idle.');
+    lines.push('');
+    lines.push('### 5. Verify the side effects outside the CLI');
+    lines.push('```bash');
+    lines.push('test -f tmp/adhdev_provider_fix_test.py');
+    lines.push('python3 tmp/adhdev_provider_fix_test.py');
+    lines.push('```');
+    lines.push('');
+    lines.push('### 6. Stop the CLI when finished');
     lines.push('```bash');
     lines.push(`curl -sS -X POST http://127.0.0.1:${DEV_SERVER_PORT}/api/cli/stop \\`);
     lines.push('  -H "Content-Type: application/json" \\');
-    lines.push(`  -d '{"type":"${type}"}'`);
+    lines.push(`  -d '{"type":"${type}","instanceId":"<INSTANCE_ID>"}'`);
     lines.push('```');
     lines.push('');
 
@@ -2701,7 +2715,9 @@ export class DevServer {
     lines.push('2. Confirm `parseOutput` produces a stable transcript without duplicating past turns when the PTY redraws.');
     lines.push('3. Confirm the latest assistant message streams through `partialResponse` while generation is in progress.');
     lines.push('4. Confirm approval parsing returns meaningful button labels when the CLI requests permission.');
-    lines.push('5. Re-run the debug endpoints after edits. Do NOT finish until the parsed result looks correct.');
+    lines.push('5. Confirm the Python file was actually created and executed, not just described in chat text.');
+    lines.push('6. Confirm the final assistant transcript includes the exact Python output, including the working directory line and the five square numbers.');
+    lines.push('7. Re-run the debug endpoints after edits. Do NOT finish until the parsed result looks correct.');
     lines.push('');
 
     if (userComment) {
@@ -2827,6 +2843,17 @@ export class DevServer {
     this.json(res, 200, { instances: result, count: result.length });
   }
 
+  private findCliTarget(type?: string, instanceId?: string): any | null {
+    if (!this.instanceManager) return null;
+    const cliStates = this.instanceManager
+      .collectAllStates()
+      .filter(s => s.category === 'cli' || s.category === 'acp');
+    if (instanceId) return cliStates.find(s => s.instanceId === instanceId) || null;
+    if (!type) return cliStates[cliStates.length - 1] || null;
+    const matches = cliStates.filter(s => s.type === type);
+    return matches[matches.length - 1] || null;
+  }
+
   /** POST /api/cli/launch — launch a CLI agent { type, workingDir?, args? } */
   private async handleCliLaunch(req: http.IncomingMessage, res: http.ServerResponse): Promise<void> {
     if (!this.cliManager) {
@@ -2860,12 +2887,7 @@ export class DevServer {
       return;
     }
 
-    // Find the CLI instance by type or instanceId
-    const allStates = this.instanceManager.collectAllStates();
-    const target = allStates.find(s =>
-      (s.category === 'cli' || s.category === 'acp') &&
-      (instanceId ? s.instanceId === instanceId : s.type === type)
-    );
+    const target = this.findCliTarget(type, instanceId);
     if (!target) {
       this.json(res, 404, { error: `No running instance found for: ${type || instanceId}` });
       return;
@@ -2888,11 +2910,7 @@ export class DevServer {
     const body = await this.readBody(req);
     const { type, instanceId } = body;
 
-    const allStates = this.instanceManager.collectAllStates();
-    const target = allStates.find(s =>
-      (s.category === 'cli' || s.category === 'acp') &&
-      (instanceId ? s.instanceId === instanceId : s.type === type)
-    );
+    const target = this.findCliTarget(type, instanceId);
     if (!target) {
       this.json(res, 404, { error: `No running instance found for: ${type || instanceId}` });
       return;
@@ -2952,12 +2970,9 @@ export class DevServer {
       return;
     }
 
-    // Find the matching CLI instance
-    const allStates = this.instanceManager.collectAllStates();
-    const target = allStates.find(s =>
-      (s.category === 'cli' || s.category === 'acp') && s.type === type
-    );
+    const target = this.findCliTarget(type);
     if (!target) {
+      const allStates = this.instanceManager.collectAllStates();
       this.json(res, 404, { error: `No running instance for: ${type}`, available: allStates.filter(s => s.category === 'cli' || s.category === 'acp').map(s => s.type) });
       return;
     }
@@ -3010,19 +3025,28 @@ export class DevServer {
       this.json(res, 503, { error: 'CliManager not available' });
       return;
     }
-    // Find adapter from cliManager.adapters map
-    let adapter: any = null;
-    for (const [, a] of this.cliManager.adapters) {
-      if (type && (a as any).cliType === type) { adapter = a; break; }
+    if (!this.instanceManager) {
+      this.json(res, 503, { error: 'InstanceManager not available' });
+      return;
     }
-    if (!adapter) {
+
+    const target = this.findCliTarget(type, instanceId);
+    if (!target) {
       this.json(res, 404, { error: `No running adapter for: ${type || instanceId}` });
       return;
     }
+
+    const instance = this.instanceManager.getInstance(target.instanceId) as any;
+    const adapter = instance?.getAdapter?.() || instance?.adapter;
+    if (!adapter) {
+      this.json(res, 404, { error: `Adapter not found for instance: ${target.instanceId}` });
+      return;
+    }
+
     try {
       if (typeof adapter.resolveModal === 'function') {
         adapter.resolveModal(buttonIndex);
-        this.json(res, 200, { resolved: true, type, buttonIndex });
+        this.json(res, 200, { resolved: true, type: target.type, instanceId: target.instanceId, buttonIndex });
       } else {
         this.json(res, 400, { error: 'resolveModal not available on this adapter' });
       }
@@ -3044,18 +3068,28 @@ export class DevServer {
       this.json(res, 503, { error: 'CliManager not available' });
       return;
     }
-    let adapter: any = null;
-    for (const [, a] of this.cliManager.adapters) {
-      if (type && (a as any).cliType === type) { adapter = a; break; }
+    if (!this.instanceManager) {
+      this.json(res, 503, { error: 'InstanceManager not available' });
+      return;
+    }
+
+    const target = this.findCliTarget(type, instanceId);
+    if (!target) {
+      this.json(res, 404, { error: `No running adapter for: ${type || instanceId}` });
+      return;
     }
+
+    const instance = this.instanceManager.getInstance(target.instanceId) as any;
+    const adapter = instance?.getAdapter?.() || instance?.adapter;
     if (!adapter) {
-      this.json(res, 404, { error: `No running adapter for: ${type || instanceId}` });
+      this.json(res, 404, { error: `Adapter not found for instance: ${target.instanceId}` });
       return;
     }
+
     try {
       if (typeof adapter.writeRaw === 'function') {
         adapter.writeRaw(keys);
-        this.json(res, 200, { sent: true, type, keysLength: keys.length });
+        this.json(res, 200, { sent: true, type: target.type, instanceId: target.instanceId, keysLength: keys.length });
       } else {
         this.json(res, 400, { error: 'writeRaw not available on this adapter' });
       }

package/src/providers/cli-provider-instance.ts

@@ -103,7 +103,8 @@ export class CliProviderInstance implements ProviderInstance {
 
  // generating during partial response add
         const partial = this.adapter.getPartialResponse();
-        if (adapterStatus.status === 'generating' && partial) {
+        const shouldAppendRawPartial = !parsedStatus;
+        if (shouldAppendRawPartial && adapterStatus.status === 'generating' && partial) {
             const cleaned = partial.trim();
             if (cleaned && cleaned !== '(generating...)') {
                 recentMessages.push({