@love-moon/conductor-sdk 0.2.31 → 0.2.33

package/dist/backend/client.d.ts

@@ -36,8 +36,14 @@ export declare class BackendApiError extends Error {
 export declare class ProjectSummary {
     readonly id: string;
     readonly name?: string | undefined;
-    readonly description?: string | null | undefined;
-    constructor(id: string, name?: string | undefined, description?: string | null | undefined);
+    readonly daemonHost?: string | null | undefined;
+    readonly workspacePath?: string | null | undefined;
+    readonly repoRoot?: string | null | undefined;
+    readonly worktreeBranch?: string | null | undefined;
+    readonly lastCommit?: string | null | undefined;
+    readonly fileCount?: number | null | undefined;
+    readonly isDefault?: boolean | undefined;
+    constructor(id: string, name?: string | undefined, daemonHost?: string | null | undefined, workspacePath?: string | null | undefined, repoRoot?: string | null | undefined, worktreeBranch?: string | null | undefined, lastCommit?: string | null | undefined, fileCount?: number | null | undefined, isDefault?: boolean | undefined);
     static fromJSON(payload: Record<string, any>): ProjectSummary;
     asObject(): Record<string, unknown>;
 }
@@ -62,9 +68,16 @@ export declare class BackendApiClient {
     constructor(config: ConductorConfig, options?: BackendClientOptions);
     listProjects(): Promise<ProjectSummary[]>;
     createProject(params: {
-        name: string;
-        description?: string;
+        name?: string;
         metadata?: Record<string, unknown>;
+        isDefault?: boolean;
+        bindingConfirmed?: boolean;
+        daemonHost?: string;
+        workspacePath?: string;
+        repoRoot?: string;
+        worktreeBranch?: string;
+        lastCommit?: string;
+        fileCount?: number;
     }): Promise<ProjectSummary>;
     listTasks(params?: {
         projectId?: string;
@@ -132,7 +145,9 @@ export declare class BackendApiClient {
         accepted?: boolean;
     }): Promise<Record<string, unknown>>;
     matchProjectByPath(params: {
-        hostname: string;
+        hostname?: string;
+        daemonHost?: string;
+        daemon_host?: string;
         path: string;
     }): Promise<{
         project: ProjectSummary | null;
@@ -141,12 +156,25 @@ export declare class BackendApiClient {
     getProject(projectId: string): Promise<{
         id: string;
         name?: string;
-        description?: string | null;
         metadata?: Record<string, unknown>;
+        daemonHost?: string | null;
+        workspacePath?: string | null;
+        repoRoot?: string | null;
+        worktreeBranch?: string | null;
+        lastCommit?: string | null;
+        fileCount?: number | null;
+        isDefault?: boolean;
     }>;
     updateProject(projectId: string, params: {
         name?: string;
         metadata?: Record<string, unknown>;
+        bindingConfirmed?: boolean;
+        daemonHost?: string;
+        workspacePath?: string;
+        repoRoot?: string;
+        worktreeBranch?: string;
+        lastCommit?: string;
+        fileCount?: number;
     }): Promise<ProjectSummary>;
     private request;
     private buildUrl;

package/dist/backend/client.js

@@ -10,24 +10,42 @@ export class BackendApiError extends Error {
 export class ProjectSummary {
     id;
     name;
-    description;
-    constructor(id, name, description) {
+    daemonHost;
+    workspacePath;
+    repoRoot;
+    worktreeBranch;
+    lastCommit;
+    fileCount;
+    isDefault;
+    constructor(id, name, daemonHost, workspacePath, repoRoot, worktreeBranch, lastCommit, fileCount, isDefault) {
         this.id = id;
         this.name = name;
-        this.description = description;
+        this.daemonHost = daemonHost;
+        this.workspacePath = workspacePath;
+        this.repoRoot = repoRoot;
+        this.worktreeBranch = worktreeBranch;
+        this.lastCommit = lastCommit;
+        this.fileCount = fileCount;
+        this.isDefault = isDefault;
     }
     static fromJSON(payload) {
         const id = payload.id ? String(payload.id) : '';
         if (!id) {
             throw new Error('Project payload missing id');
         }
-        return new ProjectSummary(id, payload.name ?? undefined, payload.description ?? undefined);
+        return new ProjectSummary(id, payload.name ?? undefined, payload.daemonHost ?? payload.daemon_host ?? null, payload.workspacePath ?? payload.workspace_path ?? null, payload.repoRoot ?? payload.repo_root ?? null, payload.worktreeBranch ?? payload.worktree_branch ?? null, payload.lastCommit ?? payload.last_commit ?? null, payload.fileCount ?? payload.file_count ?? null, payload.isDefault ?? payload.is_default ?? undefined);
     }
     asObject() {
         return {
             id: this.id,
             name: this.name,
-            description: this.description,
+            daemonHost: this.daemonHost,
+            workspacePath: this.workspacePath,
+            repoRoot: this.repoRoot,
+            worktreeBranch: this.worktreeBranch,
+            lastCommit: this.lastCommit,
+            fileCount: this.fileCount,
+            isDefault: this.isDefault,
         };
     }
 }
@@ -270,8 +288,14 @@ export class BackendApiClient {
         return {
             id: payload.id,
             name: payload.name,
-            description: payload.description,
             metadata: payload.metadata ?? undefined,
+            daemonHost: payload.daemonHost ?? payload.daemon_host ?? undefined,
+            workspacePath: payload.workspacePath ?? payload.workspace_path ?? undefined,
+            repoRoot: payload.repoRoot ?? payload.repo_root ?? undefined,
+            worktreeBranch: payload.worktreeBranch ?? payload.worktree_branch ?? undefined,
+            lastCommit: payload.lastCommit ?? payload.last_commit ?? undefined,
+            fileCount: payload.fileCount ?? payload.file_count ?? undefined,
+            isDefault: payload.isDefault ?? payload.is_default ?? undefined,
         };
     }
     async updateProject(projectId, params) {

package/dist/client.d.ts

@@ -47,6 +47,10 @@ export interface StopTaskEvent {
     requestId?: string;
     reason?: string;
 }
+export interface FlushPendingUpstreamEventsOptions {
+    timeoutMs?: number;
+    retryIntervalMs?: number;
+}
 export declare class ConductorClient {
     private readonly config;
     private readonly env;
@@ -68,6 +72,10 @@ export declare class ConductorClient {
     constructor(init: ConductorClientInit);
     static connect(options?: ConductorClientConnectOptions): Promise<ConductorClient>;
     close(): Promise<void>;
+    flushPendingUpstreamEvents(options?: FlushPendingUpstreamEventsOptions): Promise<{
+        flushed: boolean;
+        remaining: number;
+    }>;
     forceReconnect(reason?: string): Promise<void>;
     createTaskSession(payload: Record<string, any>): Promise<Record<string, any>>;
     sendMessage(taskId: string, content: string, metadata?: Record<string, any>): Promise<Record<string, any>>;
@@ -96,7 +104,8 @@ export declare class ConductorClient {
     receiveMessages(taskId: string, limit?: number): Promise<Record<string, any>>;
     ackMessages(taskId: string, ackToken?: string | null): Promise<Record<string, any> | undefined>;
     listProjects(): Promise<Record<string, any>>;
-    createProject(name: string, description?: string, metadata?: Record<string, unknown>): Promise<Record<string, any>>;
+    createProject(name: string, metadata?: Record<string, unknown>): Promise<Record<string, any>>;
+    createProject(payload: Record<string, any>): Promise<Record<string, any>>;
     listTasks(payload?: Record<string, any>): Promise<Record<string, any>>;
     getLocalProjectRecord(payload?: Record<string, any>): Promise<Record<string, any>>;
     getLocalTaskRecord(payload?: Record<string, any>): Promise<Record<string, any>>;

package/dist/client.js

@@ -1,6 +1,9 @@
 import crypto from 'node:crypto';
+import fs from 'node:fs';
+import path from 'node:path';
 import { BackendApiClient, BackendApiError } from './backend/index.js';
 import { loadConfig } from './config/index.js';
+import { ProjectContext } from './context/index.js';
 import { getPlanLimitMessageFromError } from './limits/index.js';
 import { MessageRouter } from './message/index.js';
 import { DownstreamCursorStore, DurableUpstreamOutboxStore, normalizeDownstreamCommandCursor, } from './outbox/index.js';
@@ -91,10 +94,30 @@ export class ConductorClient {
         if (this.closed) {
             return;
         }
-        this.closed = true;
         this.clearDurableOutboxTimer();
+        await this.flushPendingUpstreamEvents({
+            timeoutMs: 2_000,
+            retryIntervalMs: 100,
+        });
+        this.closed = true;
         await this.wsClient.disconnect();
     }
+    async flushPendingUpstreamEvents(options = {}) {
+        const timeoutMs = Math.max(0, options.timeoutMs ?? 5_000);
+        const retryIntervalMs = Math.max(10, options.retryIntervalMs ?? 250);
+        const startedAt = Date.now();
+        while (true) {
+            await this.requestDurableOutboxFlush(true);
+            const remaining = this.upstreamOutbox.load().length;
+            if (remaining === 0) {
+                return { flushed: true, remaining: 0 };
+            }
+            if (Date.now() - startedAt >= timeoutMs) {
+                return { flushed: false, remaining };
+            }
+            await sleep(retryIntervalMs);
+        }
+    }
     async forceReconnect(reason = 'manual_reconnect') {
         if (typeof this.wsClient.forceReconnect === 'function') {
             await this.wsClient.forceReconnect(reason);
@@ -318,12 +341,14 @@ export class ConductorClient {
                 : {
                     id: project.id,
                     name: project.name ?? null,
-                    description: project.description ?? null,
                 }),
         };
     }
-    async createProject(name, description, metadata) {
-        const project = await this.backendApi.createProject({ name, description, metadata });
+    async createProject(nameOrPayload, metadata) {
+        const payload = typeof nameOrPayload === 'string'
+            ? { name: nameOrPayload, metadata }
+            : { ...nameOrPayload };
+        const project = await this.backendApi.createProject(payload);
         return typeof project.asObject === 'function' ? project.asObject() : project;
     }
     async listTasks(payload = {}) {
@@ -436,12 +461,20 @@ export class ConductorClient {
         };
     }
     async matchProjectByPath(payload = {}) {
-        const hostname = typeof payload.hostname === 'string' ? payload.hostname : currentHostname();
-        const projectPath = typeof payload.project_path === 'string' && payload.project_path
+        const daemonHost = (typeof payload.daemon_host === 'string' && payload.daemon_host.trim()) ||
+            (typeof payload.daemonHost === 'string' && payload.daemonHost.trim()) ||
+            (typeof payload.hostname === 'string' && payload.hostname.trim()) ||
+            this.agentHost;
+        const projectPath = resolveWorkspacePath(typeof payload.project_path === 'string' && payload.project_path
             ? payload.project_path
-            : this.projectPath;
+            : typeof payload.projectPath === 'string' && payload.projectPath
+                ? payload.projectPath
+                : this.projectPath);
+        if (!projectPath) {
+            throw new Error('project_path is required');
+        }
         const result = await this.backendApi.matchProjectByPath({
-            hostname,
+            daemon_host: daemonHost,
             path: projectPath,
         });
         if (result.project) {
@@ -461,20 +494,36 @@ export class ConductorClient {
         if (!projectId) {
             throw new Error('project_id is required');
         }
-        const hostname = typeof payload.hostname === 'string' ? payload.hostname : currentHostname();
-        const projectPath = typeof payload.project_path === 'string' && payload.project_path
+        const daemonHost = (typeof payload.daemon_host === 'string' && payload.daemon_host.trim()) ||
+            (typeof payload.daemonHost === 'string' && payload.daemonHost.trim()) ||
+            (typeof payload.hostname === 'string' && payload.hostname.trim()) ||
+            this.agentHost;
+        const projectPath = resolveWorkspacePath(typeof payload.project_path === 'string' && payload.project_path
             ? payload.project_path
-            : this.projectPath;
-        const project = await this.backendApi.getProject(projectId);
-        const metadata = (project.metadata || {});
-        const localPaths = (metadata.localPaths || {});
-        localPaths[hostname] = projectPath;
-        metadata.localPaths = localPaths;
-        await this.backendApi.updateProject(projectId, { metadata });
+            : typeof payload.projectPath === 'string' && payload.projectPath
+                ? payload.projectPath
+                : this.projectPath);
+        const snapshot = resolveWorkspaceSnapshot(projectPath);
+        const boundProject = await this.backendApi.updateProject(projectId, {
+            bindingConfirmed: true,
+            daemonHost,
+            workspacePath: snapshot.projectRoot,
+            repoRoot: snapshot.repoRoot,
+            worktreeBranch: snapshot.worktreeBranch,
+            lastCommit: snapshot.lastCommit,
+            fileCount: snapshot.fileCount,
+        });
         return {
             success: true,
-            hostname,
-            path: projectPath,
+            project_id: boundProject.id,
+            project_name: boundProject.name ?? null,
+            hostname: daemonHost,
+            daemon_host: daemonHost,
+            path: snapshot.projectRoot,
+            repo_root: snapshot.repoRoot ?? null,
+            worktree_branch: snapshot.worktreeBranch ?? null,
+            last_commit: snapshot.lastCommit ?? null,
+            file_count: snapshot.fileCount ?? null,
         };
     }
     handleBackendEvent = async (payload) => {
@@ -886,3 +935,26 @@ function normalizeDeliveryScopeId(scopeId) {
     const normalized = String(scopeId || '').trim();
     return normalized || 'default';
 }
+function resolveWorkspacePath(candidate) {
+    const trimmed = typeof candidate === 'string' ? candidate.trim() : '';
+    if (!trimmed) {
+        return '';
+    }
+    try {
+        return fs.realpathSync(trimmed);
+    }
+    catch {
+        return path.resolve(trimmed);
+    }
+}
+function resolveWorkspaceSnapshot(projectPath) {
+    try {
+        const context = new ProjectContext(projectPath);
+        return context.snapshot();
+    }
+    catch {
+        return {
+            projectRoot: resolveWorkspacePath(projectPath),
+        };
+    }
+}

package/dist/context/project_context.d.ts

@@ -2,13 +2,24 @@ export interface GuessResult {
     projectRoot: string;
     repoRoot?: string;
 }
+export interface WorkspaceSnapshot {
+    projectRoot: string;
+    repoRoot?: string;
+    worktreeBranch?: string;
+    lastCommit?: string;
+    fileCount?: number;
+}
 export declare class ProjectContext {
     private readonly root;
     constructor(targetPath?: string);
     guess(): GuessResult;
+    snapshot(): WorkspaceSnapshot;
     listFiles(relativeToRepo?: boolean): string[];
     readFile(relativePath: string): string;
     getDiff(staged?: boolean): string;
     private gitRoot;
+    private gitBranch;
+    private gitHead;
+    private gitFileCount;
     private gitListFiles;
 }

package/dist/context/project_context.js

@@ -14,6 +14,21 @@ export class ProjectContext {
             repoRoot: repoRoot ?? undefined,
         };
     }
+    snapshot() {
+        const guess = this.guess();
+        if (!guess.repoRoot) {
+            return {
+                projectRoot: guess.projectRoot,
+            };
+        }
+        return {
+            projectRoot: guess.projectRoot,
+            repoRoot: guess.repoRoot,
+            worktreeBranch: this.gitBranch(guess.repoRoot) ?? undefined,
+            lastCommit: this.gitHead(guess.repoRoot) ?? undefined,
+            fileCount: this.gitFileCount(guess.repoRoot) ?? undefined,
+        };
+    }
     listFiles(relativeToRepo = true) {
         const guess = this.guess();
         if (guess.repoRoot) {
@@ -55,6 +70,35 @@ export class ProjectContext {
             return null;
         }
     }
+    gitBranch(repoRoot) {
+        try {
+            const branch = runGit(['rev-parse', '--abbrev-ref', 'HEAD'], repoRoot).trim();
+            if (!branch || branch === 'HEAD') {
+                return null;
+            }
+            return branch;
+        }
+        catch {
+            return null;
+        }
+    }
+    gitHead(repoRoot) {
+        try {
+            const head = runGit(['rev-parse', 'HEAD'], repoRoot).trim();
+            return head || null;
+        }
+        catch {
+            return null;
+        }
+    }
+    gitFileCount(repoRoot) {
+        try {
+            return this.gitListFiles(repoRoot).length;
+        }
+        catch {
+            return null;
+        }
+    }
     gitListFiles(repoRoot) {
         try {
             const output = runGit(['ls-files'], repoRoot);

package/dist/ws/client.d.ts

@@ -41,6 +41,7 @@ export interface WebSocketDisconnectEvent {
 }
 export interface WebSocketClientOptions {
     reconnectDelay?: number;
+    duplicateHostReconnectDelay?: number;
     heartbeatInterval?: number;
     extraHeaders?: Record<string, string>;
     connectImpl?: ConnectImpl;
@@ -54,6 +55,7 @@ export declare class ConductorWebSocketClient {
     private readonly url;
     private readonly token;
     private readonly reconnectDelay;
+    private readonly duplicateHostReconnectDelay;
     private readonly heartbeatInterval;
     private readonly connectImpl;
     private readonly onConnected?;
@@ -83,6 +85,7 @@ export declare class ConductorWebSocketClient {
     private listenLoop;
     private heartbeatLoop;
     private handleConnectionLoss;
+    private getReconnectDelay;
     private dispatch;
     private notifyConnected;
     private notifyReconnected;

package/dist/ws/client.js

@@ -12,6 +12,7 @@ export class ConductorWebSocketClient {
     url;
     token;
     reconnectDelay;
+    duplicateHostReconnectDelay;
     heartbeatInterval;
     connectImpl;
     onConnected;
@@ -32,6 +33,7 @@ export class ConductorWebSocketClient {
         this.url = config.resolvedWebsocketUrl;
         this.token = config.agentToken;
         this.reconnectDelay = options.reconnectDelay ?? 10_000;
+        this.duplicateHostReconnectDelay = options.duplicateHostReconnectDelay ?? Math.max(this.reconnectDelay, 2_000);
         this.heartbeatInterval = options.heartbeatInterval ?? 20_000;
         this.extraHeaders = {
             'x-conductor-host': options.hostName ?? defaultHostName(),
@@ -184,8 +186,16 @@ export class ConductorWebSocketClient {
         this.conn = null;
         this.runtime = null;
         this.notifyDisconnected(this.buildDisconnectEvent(runtime));
+        await wait(this.getReconnectDelay(runtime), this.waitController.signal);
         await this.openConnection(true);
     }
+    getReconnectDelay(runtime) {
+        if (runtime?.closeCode === 4002 &&
+            String(runtime?.closeReason || '').trim().toLowerCase() === 'duplicate-host') {
+            return this.duplicateHostReconnectDelay;
+        }
+        return this.reconnectDelay;
+    }
     async dispatch(message) {
         const now = Date.now();
         if (this.runtime) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@love-moon/conductor-sdk",
-  "version": "0.2.31",
+  "version": "0.2.33",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -27,5 +27,5 @@
     "typescript": "^5.6.3",
     "vitest": "^2.1.4"
   },
-  "gitCommitId": "7e0bd83"
+  "gitCommitId": "db7f9bf"
 }