@adhdev/daemon-core 0.9.53 → 0.9.55

package/dist/providers/contracts.d.ts

@@ -358,6 +358,8 @@ export interface ProviderModule {
     sendKey?: string;
     /** How the CLI adapter decides when to submit typed input */
     submitStrategy?: 'wait_for_echo' | 'immediate';
+    /** If true, typed input must echo on the PTY screen before the adapter sends Enter. */
+    requirePromptEchoBeforeSubmit?: boolean;
     /** Keep this provider out of the upstream auto-updated bundle */
     /** @deprecated Machine-level provider source policy now lives in config.providerSourceMode. Local overrides shadow upstream by root precedence and should not rely on provider-level disableUpstream. */
     disableUpstream?: boolean;

package/dist/shared-types.d.ts

@@ -13,6 +13,8 @@ export type { ProviderErrorReason } from './providers/provider-instance.js';
 import type { ActiveChatData as _ActiveChatData, ProviderErrorReason as _ProviderErrorReason } from './providers/provider-instance.js';
 import type { WorkspaceEntry } from './config/workspaces.js';
 import type { ProviderResumeCapability } from './providers/contracts.js';
+import type { GitCompactSummary, GitWorkspaceUpdate, WorkspaceGitSubscriptionParams } from './git/git-types.js';
+export type { GitCommandName, GitCompactSummary, GitDiffSummary, GitFailureReason, GitFileChange, GitFileChangeStatus, GitRepoIdentity, GitRepoStatus, GitSnapshot, GitSnapshotCompareSummary, GitSnapshotReason, GitWorkspaceUpdate, WorkspaceGitSubscriptionParams, } from './git/git-types.js';
 export interface SessionActiveChatData extends Omit<_ActiveChatData, 'messages'> {
     messages?: _ActiveChatData['messages'];
 }
@@ -132,7 +134,7 @@ export interface SessionHostDiagnosticsSnapshot {
     recentRequests: SessionHostRequestTrace[];
     recentTransitions: SessionHostRuntimeTransition[];
 }
-export type TransportTopic = 'session.chat_tail' | 'session.runtime_output' | 'machine.runtime' | 'session_host.diagnostics' | 'session.modal' | 'daemon.metadata';
+export type TransportTopic = 'session.chat_tail' | 'session.runtime_output' | 'machine.runtime' | 'session_host.diagnostics' | 'session.modal' | 'daemon.metadata' | 'workspace.git';
 export interface SessionChatTailSubscriptionParams extends ReadChatCursor {
     targetSessionId: string;
     historySessionId?: string;
@@ -213,6 +215,7 @@ export interface TopicUpdateEnvelopeMap {
     'session_host.diagnostics': SessionHostDiagnosticsUpdate;
     'session.modal': SessionModalUpdate;
     'daemon.metadata': DaemonMetadataUpdate;
+    'workspace.git': GitWorkspaceUpdate;
 }
 export type TopicUpdateEnvelope = TopicUpdateEnvelopeMap[TransportTopic];
 export interface SubscribeRequestMap {
@@ -222,6 +225,7 @@ export interface SubscribeRequestMap {
     'session_host.diagnostics': SessionHostDiagnosticsSubscriptionParams;
     'session.modal': SessionModalSubscriptionParams;
     'daemon.metadata': DaemonMetadataSubscriptionParams;
+    'workspace.git': WorkspaceGitSubscriptionParams;
 }
 export type SubscribeRequest = {
     [K in TransportTopic]: {
@@ -255,6 +259,7 @@ export interface SessionEntry {
     status: SessionStatus;
     title: string;
     workspace?: string | null;
+    git?: GitCompactSummary;
     runtimeKey?: string;
     runtimeDisplayName?: string;
     runtimeWorkspaceLabel?: string;
@@ -305,6 +310,7 @@ export interface CompactSessionEntry {
     status: SessionStatus;
     title: string;
     workspace: string | null;
+    git?: GitCompactSummary;
     cdpConnected?: boolean;
     runtimeKey?: string;
     runtimeDisplayName?: string;

package/dist/status/builders.d.ts

@@ -8,11 +8,13 @@
  * Consolidates ProviderState→ManagedEntry mapping logic.
  */
 import type { DaemonCdpManager } from '../cdp/manager.js';
+import type { GitCompactSummary } from '../git/git-types.js';
 import type { SessionEntry } from '../shared-types.js';
 import type { ProviderState } from '../providers/provider-instance.js';
 export type SessionEntryProfile = 'full' | 'live' | 'metadata';
 export interface SessionEntryBuildOptions {
     profile?: SessionEntryProfile;
+    getGitSummaryForWorkspace?: (workspace: string) => GitCompactSummary | null | undefined;
 }
 /**
  * Find a CDP manager by key. Supports single-window (`cursor`) and full multi-window keys (`cursor_<targetId>`).

package/dist/status/snapshot.d.ts

@@ -6,6 +6,7 @@
  * - daemon-standalone HTTP/WS status responses
  */
 import type { DaemonCdpManager } from '../cdp/manager.js';
+import type { GitCompactSummary } from '../git/git-types.js';
 import { type SessionEntryProfile } from './builders.js';
 import type { ProviderState } from '../providers/provider-instance.js';
 import type { AvailableProviderInfo, MachineInfo, RecentSessionBucket, StatusReportPayload } from '../shared-types.js';
@@ -45,6 +46,7 @@ export interface StatusSnapshotOptions {
     p2p?: StatusReportPayload['p2p'];
     machineNickname?: string | null;
     profile?: SessionEntryProfile;
+    getGitSummaryForWorkspace?: (workspace: string) => GitCompactSummary | null | undefined;
 }
 export type StatusSnapshot = StatusReportPayload;
 export interface RecentReadDebugSnapshot {

package/node_modules/@adhdev/session-host-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/session-host-core",
-  "version": "0.9.53",
+  "version": "0.9.55",
   "description": "ADHDev local session host core \u2014 session registry, protocol, buffers",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.9.53",
+  "version": "0.9.55",
   "description": "ADHDev daemon core \u2014 CDP, IDE detection, providers, command execution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/boot/daemon-lifecycle.ts

@@ -35,6 +35,7 @@ import {
 import { loadConfig } from '../config/config.js';
 import type { PtyTransportFactory } from '../cli-adapters/pty-transport.js';
 import type { IdeProviderInstance } from '../providers/ide-provider-instance.js';
+import { createDefaultGitCommandServices } from '../git/git-commands.js';
 
 // ─── Init Config ───
 
@@ -78,6 +79,9 @@ export interface DaemonInitConfig {
     statusInstanceId?: string;
     statusVersion?: string;
     statusDaemonMode?: boolean;
+
+    /** Fired before send_chat is dispatched — used for turn snapshot hooks */
+    onBeforeSendChat?: (params: { workspace: string; sessionId: string }) => void;
 }
 
 // ─── Result ───
@@ -256,6 +260,7 @@ export async function initDaemonComponents(config: DaemonInitConfig): Promise<Da
         providerLoader,
         instanceManager,
         sessionRegistry,
+        gitCommandServices: createDefaultGitCommandServices(),
         onProviderSettingChanged: async (providerType) => {
             await refreshProviderAvailability(providerType);
             config.onStatusChange?.();
@@ -264,6 +269,7 @@ export async function initDaemonComponents(config: DaemonInitConfig): Promise<Da
             await refreshProviderAvailability();
             config.onStatusChange?.();
         },
+        onBeforeSendChat: config.onBeforeSendChat,
     });
 
     // 8. AgentStreamManager

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

@@ -598,6 +598,7 @@ export class ProviderCliAdapter implements CliAdapter {
     private readonly sendDelayMs: number;
     private readonly sendKey: string;
     private readonly submitStrategy: 'wait_for_echo' | 'immediate';
+    private readonly requirePromptEchoBeforeSubmit: boolean;
     private static readonly SCRIPT_STATUS_DEBOUNCE_MS = 3000;
 
     constructor(
@@ -620,6 +621,7 @@ export class ProviderCliAdapter implements CliAdapter {
         this.sendDelayMs = resolvedConfig.sendDelayMs;
         this.sendKey = resolvedConfig.sendKey;
         this.submitStrategy = resolvedConfig.submitStrategy;
+        this.requirePromptEchoBeforeSubmit = resolvedConfig.requirePromptEchoBeforeSubmit;
         this.providerResolutionMeta = resolvedConfig.providerResolutionMeta;
 
         // Scripts are required — loaded by ProviderLoader via compatibility array
@@ -2392,6 +2394,22 @@ export class ProviderCliAdapter implements CliAdapter {
         }
 
         if (elapsed >= state.maxEchoWaitMs) {
+            const diagnostic = {
+                elapsed,
+                maxEchoWaitMs: state.maxEchoWaitMs,
+                submitDelayMs: state.submitDelayMs,
+                promptSnippet: state.normalizedPromptSnippet,
+                requirePromptEchoBeforeSubmit: this.requirePromptEchoBeforeSubmit,
+                screenText: summarizeCliTraceText(screenText, 1000),
+            };
+            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));
+                return;
+            }
+            LOG.warn('CLI', `[${this.cliType}] prompt echo was not observed before submit; sending submit key anyway elapsed=${elapsed}ms maxEchoWaitMs=${state.maxEchoWaitMs}`);
             this.submitSendKey(state, completion);
             return;
         }
@@ -2880,6 +2898,7 @@ export class ProviderCliAdapter implements CliAdapter {
             sendDelayMs: this.sendDelayMs,
             sendKey: this.sendKey,
             submitStrategy: this.submitStrategy,
+            requirePromptEchoBeforeSubmit: this.requirePromptEchoBeforeSubmit,
             submitPendingUntil: this.submitPendingUntil,
             responseSettleIgnoreUntil: this.responseSettleIgnoreUntil,
             resizeSuppressUntil: this.resizeSuppressUntil,

package/src/cli-adapters/provider-cli-config.d.ts

@@ -25,6 +25,7 @@ export interface ResolvedCliAdapterConfig {
     sendDelayMs: number;
     sendKey: string;
     submitStrategy: 'wait_for_echo' | 'immediate';
+    requirePromptEchoBeforeSubmit: boolean;
     providerResolutionMeta: ProviderResolutionMeta;
 }
 export declare function resolveCliAdapterConfig(provider: CliProviderModule): ResolvedCliAdapterConfig;

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

@@ -29,6 +29,7 @@ export interface ResolvedCliAdapterConfig {
     sendDelayMs: number;
     sendKey: string;
     submitStrategy: 'wait_for_echo' | 'immediate';
+    requirePromptEchoBeforeSubmit: boolean;
     providerResolutionMeta: ProviderResolutionMeta;
 }
 
@@ -55,6 +56,7 @@ export function resolveCliAdapterConfig(provider: CliProviderModule): ResolvedCl
             ? provider.sendKey
             : '\r',
         submitStrategy: provider.submitStrategy === 'immediate' ? 'immediate' : 'wait_for_echo',
+        requirePromptEchoBeforeSubmit: provider.requirePromptEchoBeforeSubmit === true,
         providerResolutionMeta: {
             type: provider.type,
             name: provider.name,

package/src/cli-adapters/provider-cli-shared.d.ts

@@ -104,6 +104,8 @@ export interface CliProviderModule {
     sendDelayMs?: number;
     sendKey?: string;
     submitStrategy?: 'wait_for_echo' | 'immediate';
+    /** Require the typed prompt to be visible on the PTY screen before sending Enter. */
+    requirePromptEchoBeforeSubmit?: boolean;
     /** Allow sending another prompt while the CLI is still generating so users can intervene mid-turn. */
     allowInputDuringGeneration?: boolean;
     scripts?: CliScripts;

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

@@ -122,6 +122,8 @@ export interface CliProviderModule {
     sendDelayMs?: number;
     sendKey?: string;
     submitStrategy?: 'wait_for_echo' | 'immediate';
+    /** Require the typed prompt to be visible on the PTY screen before sending Enter. */
+    requirePromptEchoBeforeSubmit?: boolean;
     /** Allow sending another prompt while the CLI is still generating so users can intervene mid-turn. */
     allowInputDuringGeneration?: boolean;
     /** When provider-owned, daemon treats provider parser output as canonical transcript authority. */

package/src/commands/handler.ts

@@ -32,6 +32,7 @@ import * as Cdp from './cdp-commands.js';
 import * as Stream from './stream-commands.js';
 import * as WorkspaceCmd from './workspace-commands.js';
 import { getWorkspaceState } from '../config/workspaces.js';
+import { handleGitCommand, isGitCommandName, type GitCommandServices } from '../git/git-commands.js';
 
 export interface CommandResult {
     success: boolean;
@@ -48,6 +49,9 @@ export interface CommandContext {
     sessionRegistry?: SessionRegistry;
     onProviderSettingChanged?: (providerType: string, key: string, value: any) => Promise<void> | void;
     onProviderSourceConfigChanged?: () => Promise<void> | void;
+    gitCommandServices?: GitCommandServices;
+    /** Fired synchronously before send_chat is dispatched; fire-and-forget for callers */
+    onBeforeSendChat?: (params: { workspace: string; sessionId: string }) => void;
 }
 
 /**
@@ -377,6 +381,13 @@ export class DaemonCommandHandler implements CommandHelpers {
         this._currentRoute = this.resolveRoute(args);
         const startedAt = Date.now();
         this.logCommandStart(cmd, args);
+        let result: CommandResult;
+
+        if (isGitCommandName(cmd)) {
+            result = await handleGitCommand(cmd, args, this._ctx.gitCommandServices);
+            this.logCommandEnd(cmd, result, startedAt);
+            return result;
+        }
 
         const sessionScopedCommands = new Set([
             'read_chat',
@@ -406,7 +417,6 @@ export class DaemonCommandHandler implements CommandHelpers {
         }
 
         // Commands without ideType CDP silently fail (prevent P2P retry spam)
-        let result: CommandResult;
         if (!this._currentRoute.session && !this._currentRoute.managerKey && !this._currentRoute.providerType) {
             const cdpCommands = ['send_chat', 'read_chat', 'list_chats', 'new_chat', 'switch_chat', 'set_mode', 'change_model', 'set_thought_level', 'resolve_action'];
             if (cdpCommands.includes(cmd)) {
@@ -416,6 +426,20 @@ export class DaemonCommandHandler implements CommandHelpers {
             }
         }
 
+        if (cmd === 'send_chat' && this._ctx.onBeforeSendChat) {
+            const sessionId = this._currentRoute.session?.sessionId;
+            const workspace = sessionId
+                ? (this._ctx.instanceManager?.getInstance(sessionId) as any)?.getState?.()?.workspace
+                : undefined;
+            if (workspace && sessionId) {
+                try {
+                    this._ctx.onBeforeSendChat({ workspace, sessionId });
+                } catch {
+                    // hook must not block send_chat
+                }
+            }
+        }
+
         try {
             result = await this.dispatch(cmd, args);
             this.logCommandEnd(cmd, result, startedAt);