@adhdev/daemon-core 0.9.76-rc.9 → 0.9.76

package/dist/mesh/coordinator-prompt.d.ts

@@ -14,5 +14,6 @@ export interface CoordinatorPromptContext {
     mesh: LocalMeshEntry;
     status?: RepoMeshStatus;
     userInstruction?: string;
+    coordinatorCliType?: string;
 }
 export declare function buildCoordinatorSystemPrompt(ctx: CoordinatorPromptContext): string;

package/dist/mesh/mesh-events.d.ts

@@ -1,2 +1,20 @@
 import type { DaemonComponents } from '../boot/daemon-lifecycle.js';
+export interface PendingMeshCoordinatorEvent {
+    event: string;
+    meshId: string;
+    nodeLabel: string;
+    metadataEvent: Record<string, unknown>;
+    queuedAt: number;
+}
+/** Drain and return all pending coordinator events, clearing the queue. */
+export declare function drainPendingMeshCoordinatorEvents(): PendingMeshCoordinatorEvent[];
+export declare function handleMeshForwardEvent(components: DaemonComponents, payload: Record<string, unknown>): {
+    success: boolean;
+    forwarded: number;
+    error?: undefined;
+} | {
+    success: boolean;
+    error: string;
+    forwarded?: undefined;
+};
 export declare function setupMeshEventForwarding(components: DaemonComponents): void;

package/dist/providers/chat-message-normalization.d.ts

@@ -2,6 +2,31 @@ import type { ChatMessage } from '../types.js';
 export declare const BUILTIN_CHAT_MESSAGE_KINDS: readonly ["standard", "thought", "tool", "terminal", "system"];
 export type BuiltinChatMessageKind = typeof BUILTIN_CHAT_MESSAGE_KINDS[number];
 export type ChatMessageKind = BuiltinChatMessageKind | (string & {});
+export declare const CHAT_MESSAGE_VISIBILITIES: readonly ["user", "debug", "internal", "hidden"];
+export declare const CHAT_MESSAGE_TRANSCRIPT_VISIBILITIES: readonly ["visible", "chat", "user", "debug", "internal", "hidden"];
+export declare const CHAT_MESSAGE_AUDIENCES: readonly ["chat", "debug", "trace", "internal"];
+export declare const CHAT_MESSAGE_SOURCES: readonly ["assistant_text", "tool_call", "terminal_command", "runtime_activity", "runtime_status", "provider_chrome", "control"];
+export declare const CHAT_MESSAGE_ACTIVITY_SOURCES: readonly ["tool_call", "terminal_command", "runtime_activity"];
+export declare const CHAT_MESSAGE_INTERNAL_SOURCES: readonly ["runtime_status", "provider_chrome", "control"];
+export type ChatMessageVisibility = typeof CHAT_MESSAGE_VISIBILITIES[number] | (string & {});
+export type ChatMessageTranscriptVisibility = typeof CHAT_MESSAGE_TRANSCRIPT_VISIBILITIES[number] | (string & {});
+export type ChatMessageAudience = typeof CHAT_MESSAGE_AUDIENCES[number] | (string & {});
+export type ChatMessageSource = typeof CHAT_MESSAGE_SOURCES[number] | (string & {});
+export type ChatMessageTranscriptSurface = 'chat' | 'activity' | 'internal';
+export interface ChatMessageVisibilityClassification {
+    surface: ChatMessageTranscriptSurface;
+    isUserFacing: boolean;
+    isActivityFacing: boolean;
+    isInternal: boolean;
+    explicitUserFacing: boolean;
+    explicitHidden: boolean;
+    role: string;
+    kind: ChatMessageKind;
+    visibility: string;
+    transcriptVisibility: string;
+    audience: string;
+    source: string;
+}
 export declare function isBuiltinChatMessageKind(kind: unknown): kind is BuiltinChatMessageKind;
 export declare function normalizeChatMessageKind(kind: unknown, role: unknown): ChatMessageKind;
 export declare function resolveChatMessageKind<T extends ChatMessage>(message: T): ChatMessageKind;
@@ -63,3 +88,18 @@ export declare function buildUserChatMessage<T extends Omit<ChatMessage, 'role'
 });
 export declare function normalizeChatMessage<T extends ChatMessage>(message: T): T;
 export declare function normalizeChatMessages<T extends ChatMessage>(messages: T[] | null | undefined): T[];
+/**
+ * Shared transcript visibility protocol for all ADHDev provider chat messages.
+ *
+ * Producers can stamp visibility/audience/source/userFacing/internal/debug either
+ * at the top level or under `meta`. Consumers should use this classifier instead
+ * of matching command text, icons, provider names, or terminal UI fragments.
+ */
+export declare function classifyChatMessageVisibility(message: ChatMessage | null | undefined): ChatMessageVisibilityClassification;
+export declare function isUserFacingChatMessage(message: ChatMessage | null | undefined): boolean;
+export declare function isActivityChatMessage(message: ChatMessage | null | undefined): boolean;
+export declare function isInternalChatMessage(message: ChatMessage | null | undefined): boolean;
+export declare function filterUserFacingChatMessages<T extends ChatMessage>(messages: T[] | null | undefined): T[];
+export declare function filterActivityChatMessages<T extends ChatMessage>(messages: T[] | null | undefined): T[];
+export declare function filterInternalChatMessages<T extends ChatMessage>(messages: T[] | null | undefined): T[];
+export declare function filterChatMessagesByVisibility<T extends ChatMessage>(messages: T[] | null | undefined, surface: ChatMessageTranscriptSurface): T[];

package/dist/providers/cli-provider-instance.d.ts

@@ -4,10 +4,11 @@
  * Lifecycle layer on top of ProviderCliAdapter.
  * collectCliData() + status transition logic from daemon-status.ts moved here.
  */
-import { type ProviderModule } from './contracts.js';
+import { type ProviderModule, type InputEnvelope } from './contracts.js';
 import type { ProviderInstance, ProviderState, InstanceContext, HotChatSessionState, SessionModalState } from './provider-instance.js';
 import { ProviderCliAdapter } from '../cli-adapters/provider-cli-adapter.js';
 import type { PtyTransportFactory } from '../cli-adapters/pty-transport.js';
+import type { ChatMessage } from '../types.js';
 type PersistableCliHistoryMessage = {
     role: string;
     content: string;
@@ -15,6 +16,9 @@ type PersistableCliHistoryMessage = {
     senderName?: string;
     receivedAt?: number;
 };
+export declare function buildCliStructuredInputPrompt(input: InputEnvelope, options?: {
+    materializeDir?: string;
+}): string;
 export declare function buildIncrementalHistoryAppendMessages(previousMessages: PersistableCliHistoryMessage[], currentMessages: PersistableCliHistoryMessage[]): PersistableCliHistoryMessage[];
 export declare function getForcedNewSessionScriptName(provider: ProviderModule | undefined, launchMode: 'new' | 'resume' | 'manual'): string | null;
 export declare function waitForCliAdapterReady(adapter: {
@@ -67,6 +71,7 @@ export declare class CliProviderInstance implements ProviderInstance {
     constructor(provider: ProviderModule, workingDir: string, cliArgs?: string[], instanceId?: string, transportFactory?: PtyTransportFactory, options?: {
         providerSessionId?: string;
         launchMode?: 'new' | 'resume' | 'manual';
+        extraEnv?: Record<string, string>;
         onProviderSessionResolved?: (info: {
             instanceId: string;
             providerType: string;
@@ -112,6 +117,7 @@ export declare class CliProviderInstance implements ProviderInstance {
     private maybeAppendRuntimeRecoveryMessage;
     private appendRuntimeSystemMessage;
     private appendRuntimeMessage;
+    mergeRuntimeChatMessages(parsedMessages: ChatMessage[]): ChatMessage[];
     private mergeConversationMessages;
     private formatApprovalRequestMessage;
     private promoteProviderSessionId;

package/dist/providers/contracts.d.ts

@@ -87,7 +87,7 @@ export interface ProviderEffect {
  * ContentBlock — ACP ContentBlock union type
  * Represents displayable content in messages, tool call results, etc.
  */
-export type ContentBlock = TextBlock | ImageBlock | AudioBlock | ResourceLinkBlock | ResourceBlock;
+export type ContentBlock = TextBlock | ImageBlock | AudioBlock | VideoBlock | ResourceLinkBlock | ResourceBlock;
 /** Text content — ACP TextContent */
 export interface TextBlock {
     type: 'text';
@@ -100,6 +100,7 @@ export interface ImageBlock {
     data: string;
     mimeType: string;
     uri?: string;
+    alt?: string;
     annotations?: ContentAnnotations;
 }
 /** Audio content — ACP AudioContent */
@@ -107,6 +108,18 @@ export interface AudioBlock {
     type: 'audio';
     data: string;
     mimeType: string;
+    uri?: string;
+    transcript?: string;
+    annotations?: ContentAnnotations;
+}
+/** Video content — ADHDev canonical display block. ACP prompt input degrades video to resource_link/text. */
+export interface VideoBlock {
+    type: 'video';
+    data?: string;
+    mimeType: string;
+    uri?: string;
+    transcript?: string;
+    posterUri?: string;
     annotations?: ContentAnnotations;
 }
 /** Resource link (file reference) — ACP ResourceLink */
@@ -487,6 +500,12 @@ export interface ProviderModule {
         input?: {
             multipart?: boolean;
             mediaTypes?: Array<'text' | 'image' | 'audio' | 'video' | 'resource'>;
+            strategies?: Array<{
+                mediaType: 'text' | 'image' | 'audio' | 'video' | 'resource';
+                strategies?: Array<'native' | 'native_acp' | 'resource_link' | 'text_fallback' | 'paste' | 'upload'>;
+                native?: boolean;
+                degradation?: Array<'native' | 'native_acp' | 'resource_link' | 'text_fallback' | 'paste' | 'upload'>;
+            }>;
         };
         output?: {
             richContent?: boolean;

package/dist/providers/io-contracts.d.ts

@@ -1,5 +1,5 @@
 import type { ContentAnnotations } from './contracts.js';
-export type InputPart = TextInputPart | ImageInputPart | AudioInputPart | VideoInputPart | ResourceInputPart;
+export type InputPart = TextInputPart | ImageInputPart | AudioInputPart | VideoInputPart | ResourceLinkInputPart | ResourceInputPart;
 export interface TextInputPart {
     type: 'text';
     text: string;
@@ -23,6 +23,7 @@ export interface VideoInputPart {
     mimeType: string;
     uri?: string;
     data?: string;
+    transcript?: string;
     posterUri?: string;
 }
 export interface ResourceInputPart {
@@ -33,6 +34,16 @@ export interface ResourceInputPart {
     text?: string;
     data?: string;
 }
+export interface ResourceLinkInputPart {
+    type: 'resource_link';
+    uri: string;
+    name: string;
+    title?: string;
+    description?: string;
+    mimeType?: string;
+    size?: number;
+    annotations?: ContentAnnotations;
+}
 export interface InputEnvelope {
     parts: InputPart[];
     textFallback: string;
@@ -52,6 +63,7 @@ export interface ImageMessagePart {
     mimeType: string;
     uri?: string;
     data?: string;
+    alt?: string;
     annotations?: ContentAnnotations;
 }
 export interface AudioMessagePart {
@@ -67,6 +79,7 @@ export interface VideoMessagePart {
     mimeType: string;
     uri?: string;
     data?: string;
+    transcript?: string;
     posterUri?: string;
     annotations?: ContentAnnotations;
 }
@@ -74,8 +87,11 @@ export interface ResourceLinkMessagePart {
     type: 'resource_link';
     uri: string;
     name: string;
+    title?: string;
+    description?: string;
     mimeType?: string;
     size?: number;
+    annotations?: ContentAnnotations;
 }
 export interface ResourceMessagePart {
     type: 'resource';

package/dist/providers/provider-input-support.d.ts

@@ -1,9 +1,25 @@
 import type { InputEnvelope, ProviderModule } from './contracts.js';
-type InputMediaType = 'text' | 'image' | 'audio' | 'video' | 'resource';
+export type InputMediaType = 'text' | 'image' | 'audio' | 'video' | 'resource';
+export type InputAttachmentStrategy = 'native' | 'native_acp' | 'resource_link' | 'text_fallback' | 'paste' | 'upload';
+export interface InputMediaStrategyDescriptor {
+    mediaType: InputMediaType;
+    strategies: InputAttachmentStrategy[];
+    native?: boolean;
+    degradation?: InputAttachmentStrategy[];
+}
+export interface MessageInputSupport {
+    text: boolean;
+    multipart: boolean;
+    mediaTypes: InputMediaType[];
+    strategies: InputMediaStrategyDescriptor[];
+}
+export declare const TEXT_ONLY_MESSAGE_INPUT_SUPPORT: MessageInputSupport;
 export declare function assertTextOnlyInput(provider: Pick<ProviderModule, 'name' | 'type'> | null | undefined, input: InputEnvelope): void;
 export declare function getDeclaredProviderInputSupport(provider?: Pick<ProviderModule, 'capabilities'> | null): {
     multipart: boolean;
     mediaTypes: Set<InputMediaType>;
+    strategies: InputMediaStrategyDescriptor[];
 };
+export declare function normalizeInputStrategyDescriptors(raw: unknown): InputMediaStrategyDescriptor[];
+export declare function getEffectiveMessageInputSupport(provider?: Pick<ProviderModule, 'category' | 'capabilities'> | null, runtimeCapabilities?: Record<string, any> | null): MessageInputSupport;
 export declare function assertProviderSupportsDeclaredInput(provider: Pick<ProviderModule, 'name' | 'type' | 'capabilities'> | null | undefined, input: InputEnvelope): void;
-export {};

package/dist/providers/provider-instance-manager.d.ts

@@ -67,6 +67,7 @@ export declare class ProviderInstanceManager {
     onEvent(listener: (event: ProviderEvent & {
         providerType: string;
     }) => void): void;
+    emitProviderEvent(providerType: string, instanceId: string, event: ProviderEvent): void;
     private emitPendingEvents;
     /**
     * Forward event to specific Instance

package/dist/providers/provider-instance.d.ts

@@ -9,6 +9,7 @@
  */
 import type { ProviderModule, ProviderResumeCapability } from './contracts.js';
 import type { AcpConfigOption, AcpMode, ProviderControlSchema, ProviderSummaryMetadata, SessionCapability } from '../shared-types.js';
+import type { MessageInputSupport } from './provider-input-support.js';
 import type { ChatMessage } from '../types.js';
 export type ProviderStatus = 'idle' | 'generating' | 'waiting_approval' | 'error' | 'stopped' | 'starting';
 export interface ProviderRuntimeWriteOwner {
@@ -71,6 +72,7 @@ interface ProviderStateBase {
     runtime?: ProviderRuntimeInfo;
     resume?: ProviderResumeCapability;
     sessionCapabilities?: SessionCapability[];
+    messageInput?: MessageInputSupport;
     /** Dynamic control current values */
     controlValues?: Record<string, string | number | boolean>;
     /** Provider-declared controls schema (from provider.controls) */
@@ -147,6 +149,8 @@ export interface InstanceContext {
     onPtyData?: (data: string) => void;
     /** Provider configvalue (resolved) */
     settings: Record<string, any>;
+    /** Immediate provider-originated status/event emission. Used to avoid waiting for status polling. */
+    emitProviderEvent?: (event: ProviderEvent) => void;
 }
 export interface ProviderInstance {
     /** Provider type */

package/dist/repo-mesh-types.d.ts

@@ -40,6 +40,8 @@ export interface RepoMeshNode {
     status: 'enabled' | 'disabled' | 'removed';
 }
 export type RepoMeshNodeHealth = 'online' | 'offline' | 'degraded' | 'dirty' | 'wrong_branch' | 'unknown';
+export type RepoMeshSessionCleanupMode = 'preserve' | 'stop' | 'delete_stopped' | 'stop_and_delete';
+export type RepoMeshSpawnedSessionVisibility = 'visible' | 'hidden';
 export interface RepoMeshPolicy {
     requirePreTaskCheckpoint: boolean;
     requirePostTaskCheckpoint: boolean;
@@ -48,11 +50,37 @@ export interface RepoMeshPolicy {
     dirtyWorkspaceBehavior: 'block' | 'warn' | 'checkpoint_then_continue';
     maxParallelTasks: number;
     allowedProviders?: string[];
+    /**
+     * Whether sessions spawned by mesh/coordinator policy should auto-open as visible
+     * dashboard tabs or start hidden. Defaults to 'visible' to preserve existing
+     * watch-the-agents behavior; hidden sessions remain discoverable and manually openable.
+     */
+    spawnedSessionVisibility?: RepoMeshSpawnedSessionVisibility;
+    /**
+     * What to do with delegated session-host records for a node when it is removed.
+     * Defaults to 'preserve' so completed work can be reviewed later and live
+     * runtimes are never stopped/deleted unless the mesh owner opts in.
+     */
+    sessionCleanupOnNodeRemove?: RepoMeshSessionCleanupMode;
+}
+export interface RepoMeshRelatedRepo {
+    /** Stable display label for an explicitly configured associated checkout. */
+    label: string;
+    /** Absolute checkout/workspace path for git freshness probes. */
+    workspace: string;
 }
 export interface RepoMeshNodePolicy {
     readOnly?: boolean;
     canPush?: boolean;
     maxConcurrentSessions?: number;
+    /** Ordered provider preference used when mesh_launch_session omits an explicit type. */
+    providerPriority?: string[];
+    /**
+     * Optional associated/external repos that must be checked alongside this node.
+     * These are explicit policy/config entries only; Repo Mesh does not auto-discover
+     * sibling paths so freshness checks stay fail-closed and non-surprising.
+     */
+    relatedRepos?: RepoMeshRelatedRepo[];
 }
 export declare const DEFAULT_MESH_POLICY: RepoMeshPolicy;
 export interface RepoMeshNodeCapabilities {
@@ -149,6 +177,12 @@ export interface LocalMeshNodeEntry {
     policy: RepoMeshNodePolicy;
     /** For single-machine mesh: same daemon, different worktree */
     isLocalWorktree?: boolean;
+    /** Branch this worktree tracks (set when created via clone_mesh_node) */
+    worktreeBranch?: string;
+    /** Node ID this worktree was cloned from */
+    clonedFromNodeId?: string;
+    /** Optional associated/external repos configured as node metadata. */
+    relatedRepos?: RepoMeshRelatedRepo[];
 }
 export interface RepoMeshStatus {
     meshId: string;

package/dist/session-host/runtime-support.d.ts

@@ -1,8 +1,9 @@
-import { type SessionHostEndpoint } from '@adhdev/session-host-core';
+import { type SessionHostEndpoint, type SessionHostRequestType } from '@adhdev/session-host-core';
 import type { HostedCliRuntimeDescriptor } from '../commands/cli-manager.js';
 export declare function ensureSessionHostReady(options: {
     appName?: string;
     spawnHost: () => void;
     timeoutMs?: number;
+    requiredRequestTypes?: readonly SessionHostRequestType[];
 }): Promise<SessionHostEndpoint>;
 export declare function listHostedCliRuntimes(endpoint: SessionHostEndpoint): Promise<HostedCliRuntimeDescriptor[]>;

package/dist/shared-types.d.ts

@@ -240,7 +240,9 @@ export type SessionTransport = 'cdp-page' | 'cdp-webview' | 'pty' | 'acp';
 export type SessionKind = 'workspace' | 'agent';
 export type SessionCapability = 'read_chat' | 'send_message' | 'new_session' | 'list_sessions' | 'switch_session' | 'resolve_action' | 'open_panel' | 'terminal_io' | 'resize_terminal' | 'change_model' | 'set_mode' | 'set_thought_level' | 'delete_notification' | 'mark_notification_unread';
 import type { RuntimeWriteOwner, RuntimeAttachedClient, SessionStatus } from './shared-types-extra.js';
+import type { MessageInputSupport } from './providers/provider-input-support.js';
 export type { RuntimeWriteOwner, RuntimeAttachedClient, SessionStatus } from './shared-types-extra.js';
+export type { MessageInputSupport, InputMediaStrategyDescriptor, InputAttachmentStrategy, InputMediaType } from './providers/provider-input-support.js';
 export interface SessionEntry {
     id: string;
     parentId: string | null;
@@ -267,6 +269,8 @@ export interface SessionEntry {
     resume?: ProviderResumeCapability;
     activeChat: SessionActiveChatData | null;
     capabilities?: SessionCapability[];
+    /** Effective message input/media support for this session. Defaults fail-closed to text-only. */
+    messageInput?: MessageInputSupport;
     cdpConnected?: boolean;
     /** Dynamic control current values (generic key-value) */
     controlValues?: Record<string, string | number | boolean>;
@@ -522,6 +526,8 @@ export interface DaemonStatusEventPayload {
     timestamp: number;
     targetSessionId?: string;
     providerType?: string;
+    providerSessionId?: string;
+    workspaceName?: string;
     duration?: number;
     elapsedSec?: number;
     modalMessage?: string;
@@ -535,6 +541,8 @@ export interface DashboardStatusEventPayload {
     daemonId?: string;
     providerType?: string;
     targetSessionId?: string;
+    providerSessionId?: string;
+    workspaceName?: string;
     duration?: number;
     elapsedSec?: number;
     modalMessage?: string;

package/dist/types.d.ts

@@ -42,6 +42,15 @@ export interface ChatMessage {
     /** Optional: fiber metadata */
     _type?: string;
     _sub?: string;
+    /** Transcript visibility/audience contract for separating chat-visible content from internal/debug runtime rows. */
+    visibility?: 'visible' | 'user' | 'chat' | 'hidden' | 'debug' | 'internal' | (string & {});
+    transcriptVisibility?: 'visible' | 'user' | 'chat' | 'hidden' | 'debug' | 'internal' | (string & {});
+    audience?: 'chat' | 'debug' | 'trace' | 'internal' | (string & {});
+    source?: 'assistant_text' | 'tool_call' | 'terminal_command' | 'runtime_activity' | 'runtime_status' | 'provider_chrome' | 'control' | (string & {});
+    userFacing?: boolean;
+    internal?: boolean;
+    isInternal?: boolean;
+    debug?: boolean;
     /** Meta information for thought/terminal logs etc */
     meta?: {
         label?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.9.76-rc.9",
+  "version": "0.9.76",
   "description": "ADHDev daemon core — CDP, IDE detection, providers, command execution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -50,18 +50,17 @@
     "@agentclientprotocol/sdk": "^0.16.1",
     "@xterm/xterm": "^6.0.0",
     "chalk": "^5.3.0",
-    "chokidar": "^5.0.0",
+    "chokidar": "^4.0.3",
     "conf": "^13.0.0",
+    "js-yaml": "^4.1.1",
     "node-pty": "^1.2.0-beta.12",
     "ws": "^8.19.0"
   },
-  "bundleDependencies": [
-    "@adhdev/session-host-core"
-  ],
   "optionalDependencies": {
     "@adhdev/ghostty-vt-node": "*"
   },
   "devDependencies": {
+    "@types/js-yaml": "^4.0.9",
     "@types/node": "^22.0.0",
     "@types/ws": "^8.18.1",
     "tsup": "^8.2.0",

package/src/chat/subscription-updates.ts

@@ -8,6 +8,7 @@ import {
   buildSessionModalDeliverySignature,
 } from './chat-signatures.js'
 import { normalizeManagedStatus } from '../status/normalize.js'
+import { normalizeChatMessages } from '../providers/chat-message-normalization.js'
 
 export interface ChatTailSubscriptionCursor {
   tailLimit: number
@@ -101,7 +102,8 @@ export function prepareSessionChatTailUpdate(
     }
   }
 
-  const messages = Array.isArray(result.messages) ? result.messages : []
+  const fullMessages = normalizeChatMessages(Array.isArray(result.messages) ? result.messages as any[] : [])
+  const messages = fullMessages
   const title = typeof result.title === 'string' ? result.title : undefined
   const activeModal = normalizeChatTailActiveModal(result.activeModal)
   const status = typeof result.status === 'string' ? result.status : 'idle'

package/src/cli-adapters/provider-cli-adapter.ts

@@ -35,6 +35,7 @@ import {
     normalizeScreenSnapshot,
     promptLikelyVisible,
     sanitizeTerminalText,
+    TerminalTranscriptAccumulator,
     type CliChatMessage,
     type CliProviderModule,
     type CliScriptInput,
@@ -195,8 +196,10 @@ export class ProviderCliAdapter implements CliAdapter {
     // ─── CLI Scripts (script-based parsing) ───
     private cliScripts: CliScripts;
     private runtimeSettings: Record<string, any> = {};
-    /** Full accumulated ANSI-stripped PTY output */
+    /** Full accumulated rendered PTY transcript for parser/readback use */
     private accumulatedBuffer: string = '';
+    /** Stateful rendered transcript accumulator; raw debug remains in accumulatedRawBuffer. */
+    private transcriptAccumulator = new TerminalTranscriptAccumulator();
     /** Full accumulated raw PTY output (with ANSI) */
     private accumulatedRawBuffer: string = '';
     /** Current visible terminal screen snapshot */
@@ -287,6 +290,7 @@ export class ProviderCliAdapter implements CliAdapter {
 
     private resetTerminalScreen(rows?: number, cols?: number): void {
         this.terminalScreen.reset(rows, cols);
+        this.transcriptAccumulator.reset();
         this.lastScreenText = '';
         this.lastScreenSnapshot = '';
         this.lastScreenChangeAt = 0;
@@ -422,6 +426,7 @@ export class ProviderCliAdapter implements CliAdapter {
         provider: CliProviderModule,
         workingDir: string,
         private extraArgs: string[] = [],
+        private extraEnv: Record<string, string> = {},
         transportFactory: PtyTransportFactory = new NodePtyTransportFactory(),
     ) {
         this.provider = provider;
@@ -523,6 +528,7 @@ export class ProviderCliAdapter implements CliAdapter {
             runtimeSettings: this.runtimeSettings,
             workingDir: this.workingDir,
             extraArgs: this.extraArgs,
+            extraEnv: this.extraEnv,
         });
 
         LOG.info('CLI', `[${this.cliType}] Spawning in ${this.workingDir}`);
@@ -632,6 +638,7 @@ export class ProviderCliAdapter implements CliAdapter {
     private handleOutput(rawData: string): void {
         this.terminalScreen.write(rawData);
         const cleanData = sanitizeTerminalText(rawData);
+        const renderedTranscript = this.transcriptAccumulator.append(rawData);
         const now = Date.now();
         const shouldReadScreen = this.shouldReadTerminalScreenSnapshot(now);
         const screenText = shouldReadScreen ? this.readTerminalScreenText(now) : this.lastScreenText;
@@ -678,15 +685,23 @@ export class ProviderCliAdapter implements CliAdapter {
             }
         }
 
-        // Rolling buffers
+        // Rolling parser/readback buffers. `accumulatedBuffer` and
+        // `recentOutputBuffer` intentionally use the rendered transcript state,
+        // not raw PTY append text, so overwritten CLI status/tool lines do not
+        // leak stale cells into read_chat / mesh_read_chat compact summaries.
         const prevRecentLen = this.recentOutputBuffer.length;
-        const prevAccumulatedLen = this.accumulatedBuffer.length;
         const prevAccumulatedRawLen = this.accumulatedRawBuffer.length;
-        this.recentOutputBuffer = appendBoundedText(this.recentOutputBuffer, cleanData, ProviderCliAdapter.MAX_RECENT_OUTPUT_BUFFER);
-        this.accumulatedBuffer = appendBoundedText(this.accumulatedBuffer, cleanData, ProviderCliAdapter.MAX_ACCUMULATED_BUFFER);
+        const nextAccumulatedBuffer = renderedTranscript.length <= ProviderCliAdapter.MAX_ACCUMULATED_BUFFER
+            ? renderedTranscript
+            : renderedTranscript.slice(-ProviderCliAdapter.MAX_ACCUMULATED_BUFFER);
+        const nextRecentOutputBuffer = nextAccumulatedBuffer.slice(-ProviderCliAdapter.MAX_RECENT_OUTPUT_BUFFER);
+        this.recentOutputBuffer = nextRecentOutputBuffer;
+        this.accumulatedBuffer = nextAccumulatedBuffer;
         this.accumulatedRawBuffer = appendBoundedText(this.accumulatedRawBuffer, rawData, ProviderCliAdapter.MAX_ACCUMULATED_BUFFER);
-        const droppedRecent = this.recordBoundedAppendDrop(prevRecentLen, cleanData.length, this.recentOutputBuffer.length);
-        const droppedClean = this.recordBoundedAppendDrop(prevAccumulatedLen, cleanData.length, this.accumulatedBuffer.length);
+        // recentOutputBuffer is a 1000-char sliding window over accumulatedBuffer.
+        // Anything that doesn't fit in the window is considered dropped.
+        const droppedRecent = Math.max(0, renderedTranscript.length - ProviderCliAdapter.MAX_RECENT_OUTPUT_BUFFER);
+        const droppedClean = Math.max(0, renderedTranscript.length - this.accumulatedBuffer.length);
         const droppedRaw = this.recordBoundedAppendDrop(prevAccumulatedRawLen, rawData.length, this.accumulatedRawBuffer.length);
         this.recentOutputDroppedChars += droppedRecent;
         this.accumulatedBufferDroppedChars += droppedClean;
@@ -1855,9 +1870,13 @@ export class ProviderCliAdapter implements CliAdapter {
             };
             this.recordTrace('submit_echo_missing', diagnostic);
             if (this.requirePromptEchoBeforeSubmit) {
-                const message = `${this.cliName} prompt echo was not observed on the PTY screen before submit`;
-                LOG.warn('CLI', `[${this.cliType}] ${message} elapsed=${elapsed}ms maxEchoWaitMs=${state.maxEchoWaitMs} screen=${JSON.stringify(diagnostic.screenText).slice(0, 240)}`);
-                completion.rejectOnce(new Error(message));
+                // At this point the prompt text write already completed. Rejecting without
+                // a submit key can leave the delegated CLI with an unsent prompt sitting at
+                // the input line, which makes later coordinator sends appear stuck. Prefer a
+                // guarded submit after the full echo wait; the existing stuck-submit retry
+                // will send a delayed follow-up Enter if the prompt remains visible.
+                LOG.warn('CLI', `[${this.cliType}] prompt echo was not observed before submit; sending guarded submit key anyway elapsed=${elapsed}ms maxEchoWaitMs=${state.maxEchoWaitMs} screen=${JSON.stringify(diagnostic.screenText).slice(0, 240)}`);
+                this.submitSendKey(state, completion);
                 return;
             }
             LOG.warn('CLI', `[${this.cliType}] prompt echo was not observed before submit; sending submit key anyway elapsed=${elapsed}ms maxEchoWaitMs=${state.maxEchoWaitMs}`);
@@ -1912,7 +1931,21 @@ export class ProviderCliAdapter implements CliAdapter {
             ? String(parsedStatusBeforeSend.status)
             : '';
         if (!allowInputDuringGeneration && (parsedSessionStatus === 'generating' || parsedSessionStatus === 'long_generating')) {
-            throw new Error(`${this.cliName} is still processing the previous prompt`);
+            const parsedModal = parsedStatusBeforeSend?.activeModal ?? parsedStatusBeforeSend?.modal ?? null;
+            const parsedHasActionableModal = Boolean(
+                parsedModal
+                && Array.isArray(parsedModal.buttons)
+                && parsedModal.buttons.some((candidate: unknown) => typeof candidate === 'string' && candidate.trim()),
+            );
+            const terminalLooksIdle = this.currentStatus === 'idle'
+                && this.runDetectStatus(this.recentOutputBuffer) === 'idle'
+                && !this.isWaitingForResponse
+                && !this.currentTurnScope
+                && !this.hasActionableApproval()
+                && !parsedHasActionableModal;
+            if (!terminalLooksIdle) {
+                throw new Error(`${this.cliName} is still processing the previous prompt`);
+            }
         }
         if (this.isWaitingForResponse && !allowInputDuringGeneration) {
             if (!this.clearStaleIdleResponseGuard('send_message_guard')) {

package/src/cli-adapters/provider-cli-runtime.ts

@@ -27,8 +27,9 @@ export function resolveCliSpawnPlan(options: {
     runtimeSettings: Record<string, any>;
     workingDir: string;
     extraArgs: string[];
+    extraEnv?: Record<string, string>;
 }): CliSpawnPlan {
-    const { provider, runtimeSettings, workingDir, extraArgs } = options;
+    const { provider, runtimeSettings, workingDir, extraArgs, extraEnv } = options;
     const { spawn: spawnConfig } = provider;
     const configuredCommand = typeof runtimeSettings.executablePath === 'string' && runtimeSettings.executablePath.trim()
         ? runtimeSettings.executablePath.trim()
@@ -65,7 +66,7 @@ export function resolveCliSpawnPlan(options: {
         shellArgs = allArgs;
     }
 
-    const env = buildCliSpawnEnv(process.env, spawnConfig.env);
+    const env = buildCliSpawnEnv(process.env, { ...(spawnConfig.env || {}), ...(extraEnv || {}) });
     // Some CLI agents, notably Hermes, route their tools through TERMINAL_CWD
     // rather than process.cwd(). Keep the generic ADHDev launch workspace as
     // the single source of truth so PTY cwd and tool cwd cannot diverge.