@adhdev/daemon-core 0.9.52 → 0.9.54

package/src/git/git-types.ts

@@ -0,0 +1,153 @@
+/**
+ * ADHDev Git surface types.
+ *
+ * Runtime-free type definitions shared by daemon-core, cloud/standalone
+ * transports, and web-core. Git state is daemon-owned product truth; do not
+ * infer these values from agent transcripts in frontend code.
+ */
+
+export type GitFailureReason =
+  | 'not_git_repo'
+  | 'git_not_installed'
+  | 'timeout'
+  | 'path_outside_repo'
+  | 'dirty_index_required'
+  | 'conflict'
+  | 'invalid_args'
+  | 'git_command_failed';
+
+export interface GitRepoIdentity {
+  workspace: string;
+  repoRoot: string | null;
+  isGitRepo: boolean;
+}
+
+export interface GitRepoStatus extends GitRepoIdentity {
+  branch: string | null;
+  headCommit: string | null;
+  headMessage: string | null;
+  upstream: string | null;
+  ahead: number;
+  behind: number;
+  staged: number;
+  modified: number;
+  untracked: number;
+  deleted: number;
+  renamed: number;
+  hasConflicts: boolean;
+  conflictFiles: string[];
+  stashCount: number;
+  lastCheckedAt: number;
+  error?: string;
+  reason?: GitFailureReason;
+}
+
+export type GitFileChangeStatus =
+  | 'added'
+  | 'modified'
+  | 'deleted'
+  | 'renamed'
+  | 'copied'
+  | 'untracked'
+  | 'conflict';
+
+export interface GitFileChange {
+  path: string;
+  oldPath?: string;
+  status: GitFileChangeStatus;
+  staged: boolean;
+  insertions: number;
+  deletions: number;
+  binary?: boolean;
+  truncated?: boolean;
+}
+
+export interface GitDiffSummary extends GitRepoIdentity {
+  files: GitFileChange[];
+  totalInsertions: number;
+  totalDeletions: number;
+  truncated: boolean;
+  lastCheckedAt: number;
+  error?: string;
+  reason?: GitFailureReason;
+}
+
+export type GitSnapshotReason =
+  | 'session_baseline'
+  | 'before_user_input_dispatch'
+  | 'before_agent_work'
+  | 'after_agent_work'
+  | 'manual';
+
+export interface GitSnapshot {
+  id: string;
+  workspace: string;
+  repoRoot: string;
+  sessionId?: string;
+  turnId?: string;
+  reason: GitSnapshotReason;
+  status: GitRepoStatus;
+  diffSummary: GitDiffSummary;
+  createdAt: number;
+}
+
+export interface GitSnapshotCompareSummary {
+  beforeSnapshotId: string;
+  afterSnapshotId: string;
+  workspace: string;
+  repoRoot: string;
+  changedFiles: number;
+  addedFiles: string[];
+  modifiedFiles: string[];
+  deletedFiles: string[];
+  renamedFiles: Array<{ oldPath: string; path: string }>;
+  untrackedFiles: string[];
+  conflictFiles: string[];
+  totalInsertions: number;
+  totalDeletions: number;
+  hasConflicts: boolean;
+  currentStatus: GitRepoStatus;
+  summaryText: string;
+}
+
+export interface GitCompactSummary {
+  isGitRepo: boolean;
+  repoRoot: string | null;
+  branch: string | null;
+  dirty: boolean;
+  changedFiles: number;
+  ahead: number;
+  behind: number;
+  hasConflicts: boolean;
+  lastCheckedAt: number;
+  error?: string;
+  reason?: GitFailureReason;
+}
+
+export interface WorkspaceGitSubscriptionParams {
+  workspace: string;
+  includeDiffSummary?: boolean;
+  intervalMs?: number;
+}
+
+export interface GitWorkspaceUpdate {
+  topic: 'workspace.git';
+  key: string;
+  workspace: string;
+  status: GitRepoStatus;
+  diffSummary?: GitDiffSummary;
+  seq: number;
+  timestamp: number;
+}
+
+export type GitCommandName =
+  | 'git_status'
+  | 'git_diff_summary'
+  | 'git_diff_file'
+  | 'git_snapshot_create'
+  | 'git_snapshot_compare'
+  | 'git_log'
+  | 'git_checkpoint'
+  | 'git_stash_push'
+  | 'git_stash_pop'
+  | 'git_checkout_files';

package/src/git/index.ts

@@ -0,0 +1,72 @@
+export type {
+  GitCommandName,
+  GitCompactSummary,
+  GitDiffSummary,
+  GitFailureReason,
+  GitFileChange,
+  GitFileChangeStatus,
+  GitRepoIdentity,
+  GitRepoStatus,
+  GitSnapshot,
+  GitSnapshotCompareSummary,
+  GitSnapshotReason,
+  GitWorkspaceUpdate,
+  WorkspaceGitSubscriptionParams,
+} from './git-types.js';
+
+export {
+  GitCommandError,
+  isPathInside,
+  normalizeGitOutput,
+  resolveGitRepository,
+  runGit,
+} from './git-executor.js';
+export type { GitCommandResult as GitExecutorCommandResult, GitExecutorOptions, RunGitOptions } from './git-executor.js';
+
+export { getGitRepoStatus, parsePorcelainV2Status } from './git-status.js';
+export type { GitStatusOptions } from './git-status.js';
+
+export { getGitDiffSummary, getGitFileDiff } from './git-diff.js';
+export type { GitDiffOptions, GitFileDiffResult } from './git-diff.js';
+
+export { createGitCompactSummary, summarizeGitStatus } from './git-summary.js';
+
+export {
+  compareGitSnapshots,
+  createGitSnapshotStore,
+  InMemoryGitSnapshotStore,
+} from './git-snapshot-store.js';
+export type {
+  GitDiffSummaryProvider,
+  GitSnapshotCreateInput,
+  GitSnapshotListQuery,
+  GitSnapshotStore,
+  GitSnapshotStoreOptions,
+  GitStatusProvider,
+  MaybePromise,
+} from './git-snapshot-store.js';
+
+export {
+  createGitWorkspaceMonitor,
+  DEFAULT_GIT_WORKSPACE_POLL_INTERVAL_MS,
+  GitWorkspaceMonitor,
+  MIN_GIT_WORKSPACE_POLL_INTERVAL_MS,
+  normalizeGitWorkspaceSubscriptionParams,
+} from './git-monitor.js';
+export type {
+  GitWorkspaceCacheEntry,
+  GitWorkspaceMonitorOptions,
+  GitWorkspaceSubscription,
+  GitWorkspaceUpdateListener,
+  NormalizedWorkspaceGitSubscriptionParams,
+  NormalizeGitWorkspaceSubscriptionOptions,
+} from './git-monitor.js';
+
+export { createDefaultGitCommandServices, handleGitCommand, isGitCommandName } from './git-commands.js';
+export type {
+  GitCommandResult,
+  GitCommandServices,
+  GitFileDiff,
+  GitLogEntry,
+  GitLogResult,
+} from './git-commands.js';

package/src/index.ts

@@ -44,6 +44,7 @@ export type {
   SessionHostDiagnosticsSubscriptionParams,
   SessionModalSubscriptionParams,
   DaemonMetadataSubscriptionParams,
+  WorkspaceGitSubscriptionParams,
   SessionChatTailUpdate,
   MachineRuntimeUpdate,
   SessionHostDiagnosticsUpdate,
@@ -81,6 +82,9 @@ export type {
   ExtensionProviderState,
 } from './shared-types.js';
 
+// ── Git Surface ──
+export * from './git/index.js';
+
 // These types live in shared-types-extra.ts — imported directly because
 // rollup-dts cannot resolve re-exports from shared-types.ts for them.
 import type { RuntimeWriteOwner as _RuntimeWriteOwner } from './shared-types-extra.js';

package/src/shared-types.ts

@@ -44,6 +44,34 @@ 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,
+    GitDiffSummary,
+    GitFailureReason,
+    GitRepoIdentity,
+    GitRepoStatus,
+    GitSnapshot,
+    GitSnapshotCompareSummary,
+    GitSnapshotReason,
+    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'];
@@ -178,7 +206,7 @@ export interface SessionHostDiagnosticsSnapshot {
     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;
@@ -272,6 +300,7 @@ export interface TopicUpdateEnvelopeMap {
     'session_host.diagnostics': SessionHostDiagnosticsUpdate;
     'session.modal': SessionModalUpdate;
     'daemon.metadata': DaemonMetadataUpdate;
+    'workspace.git': GitWorkspaceUpdate;
 }
 
 export type TopicUpdateEnvelope = TopicUpdateEnvelopeMap[TransportTopic];
@@ -283,6 +312,7 @@ export interface SubscribeRequestMap {
     'session_host.diagnostics': SessionHostDiagnosticsSubscriptionParams;
     'session.modal': SessionModalSubscriptionParams;
     'daemon.metadata': DaemonMetadataSubscriptionParams;
+    'workspace.git': WorkspaceGitSubscriptionParams;
 }
 
 export type SubscribeRequest =
@@ -327,6 +357,7 @@ export interface SessionEntry {
     status: SessionStatus;
     title: string;
     workspace?: string | null;
+    git?: GitCompactSummary;
     runtimeKey?: string;
     runtimeDisplayName?: string;
     runtimeWorkspaceLabel?: string;
@@ -378,6 +409,7 @@ export interface CompactSessionEntry {
     status: SessionStatus;
     title: string;
     workspace: string | null;
+    git?: GitCompactSummary;
     cdpConnected?: boolean;
     runtimeKey?: string;
     runtimeDisplayName?: string;

package/src/status/builders.ts

@@ -9,6 +9,7 @@
  */
 
 import type { DaemonCdpManager } from '../cdp/manager.js';
+import type { GitCompactSummary } from '../git/git-types.js';
 import type { SessionEntry, SessionCapability } from '../shared-types.js';
 import type {
     IdeProviderState,
@@ -34,6 +35,7 @@ export type SessionEntryProfile = 'full' | 'live' | 'metadata';
 
 export interface SessionEntryBuildOptions {
     profile?: SessionEntryProfile;
+    getGitSummaryForWorkspace?: (workspace: string) => GitCompactSummary | null | undefined;
 }
 
 function getActiveChatOptions(profile: SessionEntryProfile): NormalizeActiveChatOptions {
@@ -53,6 +55,14 @@ function shouldIncludeRuntimeMetadata(profile: SessionEntryProfile): boolean {
     return true;
 }
 
+function getGitSummaryForWorkspace(
+    workspace: string | null | undefined,
+    options: SessionEntryBuildOptions,
+): GitCompactSummary | undefined {
+    if (!workspace) return undefined;
+    return options.getGitSummaryForWorkspace?.(workspace) || undefined;
+}
+
 // ─── CDP Manager lookup helpers ──────────────────────
 
 /**
@@ -150,6 +160,8 @@ function buildIdeWorkspaceSession(
     const controlValues = normalizeProviderStateControlValues(state.controlValues);
     const includeSessionMetadata = shouldIncludeSessionMetadata(profile);
     const includeSessionControls = shouldIncludeSessionControls(profile);
+    const workspace = state.workspace || null;
+    const git = getGitSummaryForWorkspace(workspace, options);
     const title = activeChat?.title || state.name;
     return {
         id: state.instanceId || state.type,
@@ -162,7 +174,8 @@ function buildIdeWorkspaceSession(
             activeModal: activeChat?.activeModal || null,
         }),
         title,
-        workspace: state.workspace || null,
+        workspace,
+        ...(git && { git }),
         activeChat,
         ...(summaryMetadata && { summaryMetadata }),
         ...(includeSessionMetadata && { capabilities: state.sessionCapabilities || IDE_SESSION_CAPABILITIES }),
@@ -188,6 +201,8 @@ function buildExtensionAgentSession(
     const controlValues = normalizeProviderStateControlValues(ext.controlValues);
     const includeSessionMetadata = shouldIncludeSessionMetadata(profile);
     const includeSessionControls = shouldIncludeSessionControls(profile);
+    const workspace = parent.workspace || null;
+    const git = getGitSummaryForWorkspace(workspace, options);
     return {
         id: ext.instanceId || `${parent.instanceId}:${ext.type}`,
         parentId: parent.instanceId || parent.type,
@@ -200,7 +215,8 @@ function buildExtensionAgentSession(
             activeModal: activeChat?.activeModal || null,
         }),
         title: activeChat?.title || ext.name,
-        workspace: parent.workspace || null,
+        workspace,
+        ...(git && { git }),
         activeChat,
         ...(summaryMetadata && { summaryMetadata }),
         ...(includeSessionMetadata && { capabilities: ext.sessionCapabilities || EXTENSION_SESSION_CAPABILITIES }),
@@ -249,6 +265,8 @@ function buildCliSession(state: CliProviderState, options: SessionEntryBuildOpti
     const includeSessionMetadata = shouldIncludeSessionMetadata(profile);
     const includeRuntimeMetadata = shouldIncludeRuntimeMetadata(profile);
     const includeSessionControls = shouldIncludeSessionControls(profile);
+    const workspace = state.workspace || null;
+    const git = getGitSummaryForWorkspace(workspace, options);
     return {
         id: state.instanceId,
         parentId: null,
@@ -261,7 +279,8 @@ function buildCliSession(state: CliProviderState, options: SessionEntryBuildOpti
             activeModal: activeChat?.activeModal || null,
         }),
         title: activeChat?.title || state.name,
-        workspace: state.workspace || null,
+        workspace,
+        ...(git && { git }),
         ...(includeRuntimeMetadata && {
             runtimeKey: state.runtime?.runtimeKey,
             runtimeDisplayName: state.runtime?.displayName,
@@ -297,6 +316,8 @@ function buildAcpSession(state: AcpProviderState, options: SessionEntryBuildOpti
     const controlValues = normalizeProviderStateControlValues(state.controlValues);
     const includeSessionMetadata = shouldIncludeSessionMetadata(profile);
     const includeSessionControls = shouldIncludeSessionControls(profile);
+    const workspace = state.workspace || null;
+    const git = getGitSummaryForWorkspace(workspace, options);
     return {
         id: state.instanceId,
         parentId: null,
@@ -308,7 +329,8 @@ function buildAcpSession(state: AcpProviderState, options: SessionEntryBuildOpti
             activeModal: activeChat?.activeModal || null,
         }),
         title: activeChat?.title || state.name,
-        workspace: state.workspace || null,
+        workspace,
+        ...(git && { git }),
         activeChat,
         ...(summaryMetadata && { summaryMetadata }),
         ...(includeSessionMetadata && { capabilities: ACP_SESSION_CAPABILITIES }),

package/src/status/snapshot.ts

@@ -15,6 +15,7 @@ import { getHostMemorySnapshot } from '../system/host-memory.js';
 import { getTerminalBackendRuntimeStatus } from '../cli-adapters/terminal-screen.js';
 import { LOG } from '../logging/logger.js';
 import type { DaemonCdpManager } from '../cdp/manager.js';
+import type { GitCompactSummary } from '../git/git-types.js';
 import { buildSessionEntries, isCdpConnected, type SessionEntryProfile } from './builders.js';
 import { LIVE_STATUS_ACTIVE_CHAT_OPTIONS, normalizeActiveChatData } from './normalize.js';
 import type { ProviderState } from '../providers/provider-instance.js';
@@ -64,6 +65,7 @@ export interface StatusSnapshotOptions {
     p2p?: StatusReportPayload['p2p'];
     machineNickname?: string | null;
     profile?: SessionEntryProfile;
+    getGitSummaryForWorkspace?: (workspace: string) => GitCompactSummary | null | undefined;
 }
 
 export type StatusSnapshot = StatusReportPayload;
@@ -390,7 +392,10 @@ export function buildStatusSnapshot(options: StatusSnapshotOptions): StatusSnaps
     const unreadSourceSessions = buildSessionEntries(
         options.allStates,
         options.cdpManagers,
-        { profile: 'full' },
+        {
+            profile: 'full',
+            getGitSummaryForWorkspace: options.getGitSummaryForWorkspace,
+        },
     );
     const sessions = profile === 'full'
         ? unreadSourceSessions
@@ -399,7 +404,10 @@ export function buildStatusSnapshot(options: StatusSnapshotOptions): StatusSnaps
             : buildSessionEntries(
                 options.allStates,
                 options.cdpManagers,
-                { profile },
+                {
+                    profile,
+                    getGitSummaryForWorkspace: options.getGitSummaryForWorkspace,
+                },
             );
     const sessionsById = new Map(sessions.map((session) => [session.id, session]));
     for (const sourceSession of unreadSourceSessions) {