@adhdev/daemon-core 0.9.82-rc.400 → 0.9.82-rc.402

package/dist/cli-adapter-types.d.ts

@@ -85,8 +85,9 @@ export interface CliAdapter {
     spawn(): Promise<void>;
     sendMessage(text: string, options?: {
         force?: boolean;
+        meshTaskId?: string;
     }): Promise<void>;
-    forceSendMessage?(text: string): Promise<void>;
+    forceSendMessage?(text: string, meshTaskId?: string): Promise<void>;
     getStatus(options?: {
         allowParse?: boolean;
     }): CliAdapterStatus;

package/dist/cli-adapters/cli-state-engine.d.ts

@@ -58,6 +58,7 @@ export declare class CliStateEngine {
     currentStatus: CliSessionStatus['status'];
     isWaitingForResponse: boolean;
     currentTurnScope: TurnParseScope | null;
+    currentTurnTaskId: string | null;
     activeModal: {
         message: string;
         buttons: string[];

package/dist/cli-adapters/provider-cli-adapter.d.ts

@@ -187,8 +187,9 @@ export declare class ProviderCliAdapter implements CliAdapter {
     private waitForEchoAndSubmit;
     sendMessage(text: string, options?: {
         force?: boolean;
+        meshTaskId?: string;
     }): Promise<void>;
-    forceSendMessage(text: string): Promise<void>;
+    forceSendMessage(text: string, meshTaskId?: string): Promise<void>;
     private waitForForceSubmitSettle;
     private enqueuePendingOutboundMessage;
     private shouldQueuePendingOutboundMessage;
@@ -229,6 +230,7 @@ export declare class ProviderCliAdapter implements CliAdapter {
     } | null);
     get currentTurnScope(): TurnParseScope | null;
     set currentTurnScope(v: TurnParseScope | null);
+    get currentTurnTaskId(): string | null;
     get responseEpoch(): number;
     set responseEpoch(v: number);
     get submitRetryUsed(): boolean;

package/dist/cli-adapters/provider-cli-parse.d.ts

@@ -4,6 +4,7 @@ export interface TurnParseScope {
     startedAt: number;
     bufferStart: number;
     rawBufferStart: number;
+    taskId?: string;
 }
 export declare function normalizeCliParsedMessages(parsedMessages: any[], _options: {
     scope?: TurnParseScope | null;

package/dist/git/git-worktree.d.ts

@@ -19,11 +19,54 @@ export interface WorktreeCreateOptions {
     meshName: string;
     /** Override the auto-resolved target directory */
     targetDir?: string;
+    /**
+     * Remote to fetch+compare the base branch against before branching.
+     * Default: 'origin'.
+     */
+    remote?: string;
+    /**
+     * When true (default) and `baseBranch` is given, fetch the base branch from
+     * `remote` and, if the local base branch is strictly behind the remote
+     * (no divergence), branch the worktree from the remote-tracking ref instead
+     * of the stale local ref. The decision is always surfaced via `baseSync`.
+     * Set false to preserve the legacy "branch from local ref, never fetch"
+     * behavior.
+     */
+    syncBaseFromRemote?: boolean;
+}
+/**
+ * How the worktree's start point was resolved relative to the remote base.
+ * Surfaced so the coordinator can detect a stale base node before dispatching
+ * work onto a worktree built on a behind/diverged base.
+ */
+export interface WorktreeBaseSync {
+    /** The base branch name requested (e.g. 'main'). */
+    branch: string;
+    /** The remote compared against (e.g. 'origin'). */
+    remote: string;
+    /** The actual ref/commit-ish used as the worktree branch start point. */
+    startRef: string;
+    /** Whether `git fetch <remote> <branch>` succeeded. */
+    fetched: boolean;
+    /** Local base-branch SHA before clone, if the local ref exists. */
+    localSha?: string;
+    /** Remote-tracking base-branch SHA after fetch, if it exists. */
+    remoteSha?: string;
+    /** Commits the local base ref is behind the remote (0 when up-to-date/ahead). */
+    behindBy: number;
+    /** Commits the local base ref is ahead of the remote. */
+    aheadBy: number;
+    /** What was done with the base ref. */
+    action: 'up_to_date' | 'local_behind_used_remote' | 'local_ahead_used_local' | 'diverged_used_local' | 'no_remote_ref_used_local' | 'no_local_ref_used_remote';
+    /** Human-readable warning when the base was stale/diverged. */
+    warning?: string;
 }
 export interface WorktreeCreateResult {
     success: true;
     worktreePath: string;
     branch: string;
+    /** Present when `baseBranch` was given and base sync resolution ran. */
+    baseSync?: WorktreeBaseSync;
 }
 export interface WorktreeEntry {
     path: string;
@@ -56,7 +99,12 @@ export declare function resolveWorktreePath(repoRoot: string, meshName: string,
 /**
  * Create a new git worktree with a fresh branch.
  *
- * Runs: git worktree add <targetDir> -b <branch> [baseBranch]
+ * Runs: git worktree add <targetDir> -b <branch> [startRef]
+ *
+ * When `baseBranch` is given and `syncBaseFromRemote` is not disabled, the
+ * start point is resolved against the remote first (see
+ * resolveWorktreeBaseStartPoint) so a stale local base does not produce a stale
+ * worktree. The resolution is returned as `baseSync`.
  */
 export declare function createWorktree(opts: WorktreeCreateOptions): Promise<WorktreeCreateResult>;
 /**

package/dist/git/index.d.ts

@@ -17,4 +17,4 @@ export type { GitCommandResult, GitCommandServices, GitFileDiff, GitLogEntry, Gi
 export { TurnSnapshotTracker } from './turn-snapshot-tracker.js';
 export type { TurnCompletedCallback } from './turn-snapshot-tracker.js';
 export { createWorktree, listWorktrees, parseWorktreeListOutput, removeWorktree, resolveWorktreePath, } from './git-worktree.js';
-export type { WorktreeCreateOptions, WorktreeCreateResult, WorktreeEntry, WorktreeRemoveResult, } from './git-worktree.js';
+export type { WorktreeBaseSync, WorktreeCreateOptions, WorktreeCreateResult, WorktreeEntry, WorktreeRemoveResult, } from './git-worktree.js';