lark-remote 0.5.12 → 0.5.13

package/dist/router/paging.d.ts

@@ -0,0 +1,13 @@
+export declare function pageInfo(totalCount: number, offset: number, pageSize: number): {
+    totalPages: number;
+    safeOffset: number;
+    currentPage: number;
+};
+export declare function pageSlice<T>(items: readonly T[], offset: number, pageSize: number): {
+    totalCount: number;
+    totalPages: number;
+    safeOffset: number;
+    currentPage: number;
+    pageItems: T[];
+    hasPagination: boolean;
+};

package/dist/router/paging.js

@@ -0,0 +1,20 @@
+import { clampInt } from '../common/clamp.js';
+export function pageInfo(totalCount, offset, pageSize) {
+    const totalPages = Math.max(1, Math.ceil(totalCount / pageSize));
+    const maxOffset = Math.max(0, (totalPages - 1) * pageSize);
+    const safeOffset = clampInt(offset, 0, maxOffset);
+    const currentPage = Math.floor(safeOffset / pageSize) + 1;
+    return { totalPages, safeOffset, currentPage };
+}
+export function pageSlice(items, offset, pageSize) {
+    const { totalPages, safeOffset, currentPage } = pageInfo(items.length, offset, pageSize);
+    return {
+        totalCount: items.length,
+        totalPages,
+        safeOffset,
+        currentPage,
+        pageItems: items.slice(safeOffset, safeOffset + pageSize),
+        hasPagination: items.length > pageSize,
+    };
+}
+//# sourceMappingURL=paging.js.map

package/dist/router/path-validation.d.ts

@@ -0,0 +1,27 @@
+import fs from 'node:fs';
+export type PathKind = 'directory' | 'file' | 'missing' | 'unreadable';
+export type StatResolution = {
+    ok: true;
+    stat: fs.Stats;
+} | {
+    ok: false;
+    reason: 'missing' | 'unreadable';
+};
+export type DirectoryResolution = {
+    ok: true;
+    canonical: string;
+} | {
+    ok: false;
+    reason: 'missing' | 'not_directory' | 'unreadable';
+};
+/**
+ * Inspect a path without a preceding existsSync call.
+ *
+ * stat already distinguishes missing paths from files/directories and closes
+ * the exists→stat race. Permission and other IO failures stay distinguishable
+ * from a normal missing path so callers can keep their user-facing messages.
+ */
+export declare function statPath(target: string): StatResolution;
+export declare function inspectPath(target: string): PathKind;
+export declare function resolveDirectory(target: string): DirectoryResolution;
+export declare function isDirectorySafe(target: string): boolean;

package/dist/router/path-validation.js

@@ -0,0 +1,45 @@
+import fs from 'node:fs';
+/**
+ * Inspect a path without a preceding existsSync call.
+ *
+ * stat already distinguishes missing paths from files/directories and closes
+ * the exists→stat race. Permission and other IO failures stay distinguishable
+ * from a normal missing path so callers can keep their user-facing messages.
+ */
+export function statPath(target) {
+    try {
+        return { ok: true, stat: fs.statSync(target) };
+    }
+    catch (err) {
+        const code = err.code;
+        return {
+            ok: false,
+            reason: code === 'ENOENT' || code === 'ENOTDIR' ? 'missing' : 'unreadable',
+        };
+    }
+}
+export function inspectPath(target) {
+    const resolution = statPath(target);
+    if (!resolution.ok)
+        return resolution.reason;
+    return resolution.stat.isDirectory() ? 'directory' : 'file';
+}
+export function resolveDirectory(target) {
+    const kind = inspectPath(target);
+    if (kind === 'missing')
+        return { ok: false, reason: 'missing' };
+    if (kind === 'unreadable')
+        return { ok: false, reason: 'unreadable' };
+    if (kind === 'file')
+        return { ok: false, reason: 'not_directory' };
+    try {
+        return { ok: true, canonical: fs.realpathSync(target) };
+    }
+    catch {
+        return { ok: false, reason: 'unreadable' };
+    }
+}
+export function isDirectorySafe(target) {
+    return inspectPath(target) === 'directory';
+}
+//# sourceMappingURL=path-validation.js.map

package/dist/runner/claude/runner.d.ts

@@ -3,10 +3,9 @@ import { type AgentEvent, type SpawnOptions, type AgentSessionReader, type Agent
  * Claude Agent Runner（长驻交互模式）。
  *
  * 权限模式（permissionMode）在 spawn 时经 --permission-mode 生效：
- * - 默认 bypassPermissions：claude 内部自动放行，无 control_request → 行为与
- *   旧版完全一致（无审批卡）；
- * - 配置为 default/acceptEdits/manual/plan 等：工具调用经 control_request
- *   上抛 → bridge ApprovalCoordinator → run 卡审批区。
+ * - 默认 auto：低风险操作自动放行，高风险操作的 control_request 上抛 →
+ *   bridge ApprovalCoordinator → run 卡审批区；
+ * - bypassPermissions：claude 内部全部放行，无 control_request（无审批卡）。
  */
 export declare class ClaudeRunner implements AgentRunner {
     readonly kind: "claude";

package/dist/runner/claude/runner.js

@@ -24,10 +24,9 @@ const COMPACT_COMMAND = '/compact';
  * Claude Agent Runner（长驻交互模式）。
  *
  * 权限模式（permissionMode）在 spawn 时经 --permission-mode 生效：
- * - 默认 bypassPermissions：claude 内部自动放行，无 control_request → 行为与
- *   旧版完全一致（无审批卡）；
- * - 配置为 default/acceptEdits/manual/plan 等：工具调用经 control_request
- *   上抛 → bridge ApprovalCoordinator → run 卡审批区。
+ * - 默认 auto：低风险操作自动放行，高风险操作的 control_request 上抛 →
+ *   bridge ApprovalCoordinator → run 卡审批区；
+ * - bypassPermissions：claude 内部全部放行，无 control_request（无审批卡）。
  */
 export class ClaudeRunner {
     kind = 'claude';
@@ -40,7 +39,7 @@ export class ClaudeRunner {
     constructor(opts) {
         this.defaultModel = opts.model ?? 'claude-opus-4-8';
         this.defaultEffort = opts.effort ?? 'medium';
-        this.permissionMode = opts.permissionMode ?? 'bypassPermissions';
+        this.permissionMode = opts.permissionMode ?? 'auto';
         this.sessionReader = opts.sessionReader ?? new ClaudeSessionReader();
         this.session = new ClaudeSession({
             pidDir: opts.pidDir,

package/dist/runner/claude/session.js

@@ -100,7 +100,7 @@ export class ClaudeSession extends SpawningRunner {
             agent: 'claude',
         });
         this.binary = 'claude';
-        this.permissionMode = opts.permissionMode ?? 'bypassPermissions';
+        this.permissionMode = opts.permissionMode ?? 'auto';
         this.settings = opts.settings;
         this.defaultEffort = opts.effort;
         this.idleTtlMs = opts.idleTtlMs ?? DEFAULT_IDLE_TTL_MS;

package/dist/runner/codex/app-server/translator.d.ts

@@ -17,6 +17,8 @@ export declare class CodexAppServerTranslator {
     private turnStatus;
     /** Full agentMessage text per item id (item-scoped snapshot). */
     private textByItem;
+    /** agentMessage item ids whose protocol phase is `final_answer`. */
+    private finalTextItems;
     /**
      * Reasoning content per item id: paragraphs keyed by `contentIndex`
      * (textDelta) plus the summary stream (summaryTextDelta). Each reasoning

package/dist/runner/codex/app-server/translator.js

@@ -18,6 +18,8 @@ export class CodexAppServerTranslator {
     turnStatus = 'pending';
     /** Full agentMessage text per item id (item-scoped snapshot). */
     textByItem = new Map();
+    /** agentMessage item ids whose protocol phase is `final_answer`. */
+    finalTextItems = new Set();
     /**
      * Reasoning content per item id: paragraphs keyed by `contentIndex`
      * (textDelta) plus the summary stream (summaryTextDelta). Each reasoning
@@ -141,15 +143,24 @@ export class CodexAppServerTranslator {
                 const text = item.text ?? '';
                 if (text && this.textByItem.get(item.id) !== text) {
                     this.textByItem.set(item.id, text);
-                    events.push({
-                        type: 'turn_diff',
-                        text,
-                        itemId: item.id,
-                        complete: true,
-                        threadId: params?.threadId ?? this.threadId,
-                        turnId: params?.turn?.id ?? this.turnId,
-                        timestamp: this.now(),
-                    });
+                    const final = item.phase === 'final_answer';
+                    events.push(final
+                        ? {
+                            type: 'final_answer',
+                            text,
+                            itemId: item.id,
+                            complete: true,
+                            timestamp: this.now(),
+                        }
+                        : {
+                            type: 'turn_diff',
+                            text,
+                            itemId: item.id,
+                            complete: true,
+                            threadId: params?.threadId ?? this.threadId,
+                            turnId: params?.turn?.id ?? this.turnId,
+                            timestamp: this.now(),
+                        });
                 }
             }
             else if (item.type === 'plan') {
@@ -228,6 +239,7 @@ export class CodexAppServerTranslator {
         // 的 turnId 闸门挡掉。
         this.usage = { inputTokens: 0, outputTokens: 0 };
         this.textByItem.clear();
+        this.finalTextItems.clear();
         this.reasoningByItem.clear();
         this.toolOutputByItem.clear();
         this.toolItemMeta.clear();
@@ -249,6 +261,17 @@ export class CodexAppServerTranslator {
         const prev = this.textByItem.get(params.itemId) ?? '';
         const next = prev + params.delta;
         this.textByItem.set(params.itemId, next);
+        if (this.finalTextItems.has(params.itemId)) {
+            return [
+                {
+                    type: 'final_answer',
+                    text: next,
+                    itemId: params.itemId,
+                    complete: false,
+                    timestamp: this.now(),
+                },
+            ];
+        }
         return [
             {
                 type: 'turn_diff',
@@ -358,6 +381,19 @@ export class CodexAppServerTranslator {
             if (text || accumulated) {
                 const finalText = text || accumulated;
                 this.textByItem.set(item.id, finalText);
+                if (item.phase === 'final_answer' ||
+                    this.finalTextItems.has(item.id)) {
+                    this.finalTextItems.delete(item.id);
+                    return [
+                        {
+                            type: 'final_answer',
+                            text: finalText,
+                            itemId: item.id,
+                            complete: true,
+                            timestamp: this.now(),
+                        },
+                    ];
+                }
                 return [
                     {
                         type: 'turn_diff',
@@ -635,6 +671,26 @@ export class CodexAppServerTranslator {
     }
     handleItemStarted(params) {
         const item = params.item;
+        if (item.type === 'agentMessage') {
+            const phase = item.phase;
+            if (phase === 'final_answer') {
+                this.finalTextItems.add(item.id);
+                const text = item.text ?? '';
+                if (text) {
+                    this.textByItem.set(item.id, text);
+                    return [
+                        {
+                            type: 'final_answer',
+                            text,
+                            itemId: item.id,
+                            complete: false,
+                            timestamp: this.now(),
+                        },
+                    ];
+                }
+            }
+            return [];
+        }
         if (item.type === 'fileChange' && Array.isArray(item.changes)) {
             this.fileChangeItems.set(item.id, item.changes);
             const pending = this.pendingFileApprovalByItemId.get(item.id);

package/dist/runner/common/acp/base-translator.d.ts

@@ -19,16 +19,10 @@
  *   buildToolUseUpdate                                — tool_use patch from tool_call_update
  *   onUsageSample                                     — extra usage bookkeeping (opencode: cost)
  */
-import type { AgentEvent, ApprovalRequestedEvent, ResultEvent } from '../../types.js';
+import type { AgentEvent, ApprovalRequestedEvent, ApprovalView, ResultEvent, TurnStartedEvent } from '../../types.js';
 import { type AgentMessageChunkEvent, type AgentThoughtChunkEvent, type ToolCallEvent, type ToolCallUpdateEvent, type UsageUpdateEvent, type RequestPermissionParams, type AcpPlanEvent } from './protocol-types.js';
 /** Self-produced turn_started event (no wire equivalent — produced on prompt start). */
-export interface AcpTurnStartedEvent {
-    type: 'turn_started';
-    threadId: string;
-    turnId: string;
-    operationKind: 'turn' | 'compaction';
-    timestamp?: string;
-}
+export type AcpTurnStartedEvent = TurnStartedEvent;
 /**
  * Live usage snapshot from usage_update. The ACP wire carries context
  * occupancy (`used`) and the model context window (`size`) — there is NO
@@ -96,6 +90,7 @@ export declare abstract class BaseAcpTranslator {
      * is sent (no wire notification for this — self-produced).
      */
     produceTurnStarted(sessionId: string, turnId: string): AcpTurnStartedEvent;
+    protected approvalRequestedEvents(requestId: number | string, sessionId: string, view: ApprovalView): ApprovalRequestedEvent[];
     /**
      * Translate a prompt response into a result event.
      * stopReason: end_turn → success; cancelled → interrupted (independent

package/dist/runner/common/acp/base-translator.js

@@ -1,3 +1,4 @@
+import { makeTurnStartedEvent } from '../turn-started.js';
 import { NotificationMethod, ServerRequestMethod, SessionEventType, } from './protocol-types.js';
 /**
  * ACP tool kind → 常用工具名映射（信息保真，数据驱动无 agent 分支）。
@@ -145,13 +146,21 @@ export class BaseAcpTranslator {
      */
     produceTurnStarted(sessionId, turnId) {
         this.currentTurnId = turnId;
-        return {
-            type: 'turn_started',
-            threadId: sessionId,
-            turnId,
-            operationKind: this.operationKind === 'compact' ? 'compaction' : 'turn',
-            timestamp: new Date().toISOString(),
-        };
+        return makeTurnStartedEvent(sessionId, turnId, this.operationKind);
+    }
+    approvalRequestedEvents(requestId, sessionId, view) {
+        return [
+            {
+                type: 'approval_requested',
+                requestId,
+                kind: 'command',
+                threadId: sessionId,
+                turnId: '',
+                itemId: '',
+                view,
+                timestamp: new Date().toISOString(),
+            },
+        ];
     }
     /**
      * Translate a prompt response into a result event.

package/dist/runner/common/spawning-runner.js

@@ -374,13 +374,19 @@ export class SpawningRunner {
             try {
                 process.kill(-pid, 'SIGTERM');
             }
-            catch {
-                // process may have exited
+            catch (err) {
+                const code = err.code;
+                if (code === 'ESRCH') {
+                    getLogger().debug(`[${this.logTag}] orphan process group ${-pid} already exited`);
+                }
+                else {
+                    getLogger().warn(`[${this.logTag}] killOrphan failed to signal process group ${-pid}: ${err?.message ?? String(err)}`);
+                }
             }
             bestEffortUnlink(this.pidFilePath);
         }
-        catch {
-            // ignore
+        catch (err) {
+            getLogger().warn(`[${this.logTag}] killOrphan failed for ${this.pidFilePath}: ${err?.message ?? String(err)}`);
         }
     }
     /**

package/dist/runner/common/turn-started.d.ts

@@ -0,0 +1,2 @@
+import type { TurnStartedEvent } from '../types.js';
+export declare function makeTurnStartedEvent(sessionId: string, turnId: string, operationKind: 'turn' | 'compact'): TurnStartedEvent;

package/dist/runner/common/turn-started.js

@@ -0,0 +1,10 @@
+export function makeTurnStartedEvent(sessionId, turnId, operationKind) {
+    return {
+        type: 'turn_started',
+        threadId: sessionId,
+        turnId,
+        operationKind: operationKind === 'compact' ? 'compaction' : 'turn',
+        timestamp: new Date().toISOString(),
+    };
+}
+//# sourceMappingURL=turn-started.js.map

package/dist/runner/dsh/auth.js

@@ -10,10 +10,10 @@
  */
 import { createHash, createHmac } from 'node:crypto';
 import fs from 'node:fs';
-import os from 'node:os';
 import path from 'node:path';
 import YAML from 'yaml';
 import { isWin32 } from '../../platform/select.js';
+import { resolveDshHome } from './home.js';
 /** Credential record that owns the browser-cookie signing secret. */
 export const DSH_BROWSER_CREDENTIAL_KEY = 'client-connection/browser-session';
 /** Short lifetime keeps every request safely inside DSH's configurable max age. */
@@ -29,8 +29,7 @@ function isRecord(value) {
  * file matches the `DSH_HOME` lark-remote passes to a process it starts.
  */
 export function resolveDshCredentialsFile(env = process.env, configuredHome) {
-    const home = configuredHome?.trim() || env.DSH_HOME?.trim();
-    return path.join(home && home.length > 0 ? home : path.join(os.homedir(), '.dsh'), '.credentials.yaml');
+    return path.join(resolveDshHome(configuredHome, env), '.credentials.yaml');
 }
 /** Whether a filesystem error means the credentials file is absent. */
 export function isDshCredentialsNotFound(error) {

package/dist/runner/dsh/client.d.ts

@@ -21,6 +21,7 @@
  */
 import type { DshApprovalStreamItem, DshCommandResult, DshModelCatalogValue, DshModelSelection, DshOpenTurnState, DshPermissionCatalogValue, DshJobView, DshPresetListValue, DshProjectionItem, DshProjectionSnapshot, DshQuestion, DshRemoteEventOutcome, DshSessionPageValue, DshStreamItem, DshTokenUsage } from './types.js';
 import type { GoalView } from '../types.js';
+export { DshError } from './errors.js';
 interface WebSocketMessageEvent {
     data: unknown;
 }
@@ -40,11 +41,6 @@ export interface WebSocketLike {
     close(): void;
 }
 export type WebSocketFactory = (url: string, options?: WebSocketOptions) => WebSocketLike;
-export declare class DshError extends Error {
-    readonly code: string;
-    readonly details: Record<string, unknown>;
-    constructor(code: string, message: string, details?: Record<string, unknown>);
-}
 export interface DshClientOptions {
     /** Configured DSH home; selects `.credentials.yaml` when no explicit file is given. */
     dshHome?: string;
@@ -372,4 +368,3 @@ export declare function dshQuestionsOf(request: Record<string, unknown>): DshQue
  * silently on the server side.
  */
 export declare function isTimedQuestionRequest(request: Record<string, unknown>): boolean;
-export {};

package/dist/runner/dsh/client.js

@@ -25,6 +25,9 @@ import { getLogger } from '../../logger/index.js';
 import { DSH_COOKIE_LIFETIME_MS, isDshCredentialsNotFound, mintDshBrowserCookie, readDshBrowserSecret, resolveDshCredentialsFile, } from './auth.js';
 import { DEFAULT_REQUEST_TIMEOUT_MS } from '../common/defaults.js';
 import { goalFromProjection } from './goal-view.js';
+import { DshError } from './errors.js';
+import { openMuxStream } from './mux-stream.js';
+export { DshError } from './errors.js';
 function defaultWebSocketFactory(url, options) {
     const socket = new WebSocket(url, {
         ...(options?.headers ? { headers: options.headers } : {}),
@@ -35,16 +38,6 @@ function defaultWebSocketFactory(url, options) {
     });
     return socket;
 }
-export class DshError extends Error {
-    code;
-    details;
-    constructor(code, message, details = {}) {
-        super(message);
-        this.name = 'DshError';
-        this.code = code;
-        this.details = details;
-    }
-}
 function isDshAuthError(error) {
     return (error instanceof DshError &&
         error.code === 'http' &&
@@ -602,162 +595,15 @@ export class DshClient {
      * close, error, or `signal` abort.
      */
     async *muxStream(endpoint, payload, signal) {
-        const cookie = await this.authCookie();
-        const socket = this.webSocketImpl(`${this.baseUrl.replace(/^http/, 'ws')}/api/remote.mux`, cookie ? { headers: { cookie } } : undefined);
-        const streamId = `lr-${Date.now()}-${Math.random().toString(36).slice(2, 10)}`;
-        const queue = [];
-        let waiter = null;
-        let ended = false;
-        let failure;
-        let opened = false;
-        const settle = (frame) => {
-            if (waiter) {
-                const resolve = waiter;
-                waiter = null;
-                resolve(frame);
-                return;
-            }
-            if (frame)
-                queue.push(frame);
-            else
-                ended = true;
-        };
-        // 建连/首帧超时：服务器接受 TCP 但不完成 WS 握手时 onopen/onerror/onclose
-        // 都不触发，generator 会永远停在 await next()——unary 挂起有 60s 预算与
-        // 回归测试（test_anchor_dsh_stop_with_hung_unary_releases_run），mux 的
-        // 同型问题此前只能靠 idle 看门狗兜底。超时按传输错误走既有重连路径。
-        const connectTimer = setTimeout(() => {
-            if (opened || ended)
-                return;
-            failure = new DshError('transport', 'DSH remote mux WebSocket connect timeout');
-            ended = true;
-            settle(undefined);
-            try {
-                socket.close();
-            }
-            catch {
-                /* ignore close error */
-            }
-        }, this.requestTimeoutMs);
-        connectTimer.unref?.();
-        socket.onopen = () => {
-            opened = true;
-            clearTimeout(connectTimer);
-            if (ended)
-                return;
-            try {
-                socket.send(JSON.stringify({
-                    type: 'open',
-                    streamId,
-                    endpoint,
-                    payload,
-                }));
-            }
-            catch (err) {
-                failure = new DshError('transport', `DSH remote mux send error: ${err.message}`);
-                ended = true;
-                settle(undefined);
-            }
-        };
-        socket.onmessage = (event) => {
-            if (ended)
-                return;
-            const text = typeof event.data === 'string'
-                ? event.data
-                : Buffer.isBuffer(event.data)
-                    ? event.data.toString('utf8')
-                    : String(event.data);
-            let message;
-            try {
-                message = JSON.parse(text);
-            }
-            catch {
-                getLogger().warn('[dsh] dropped malformed remote mux frame');
-                return;
-            }
-            if (message.streamId !== streamId)
-                return;
-            if (message.type === 'item' && message.value) {
-                settle(message.value);
-                return;
-            }
-            if (message.type === 'end') {
-                ended = true;
-                settle(undefined);
-                return;
-            }
-            if (message.type === 'error') {
-                failure = new DshError(message.error?.code ?? 'stream', message.error?.message ?? 'DSH remote stream failed', message.error?.details ?? {});
-                ended = true;
-                settle(undefined);
-            }
-        };
-        socket.onerror = () => {
-            if (ended)
-                return;
-            failure = new DshError('transport', 'DSH remote mux WebSocket error');
-            ended = true;
-            settle(undefined);
-        };
-        socket.onunexpectedresponse = (event) => {
-            if (ended)
-                return;
-            const status = event.statusCode;
-            failure = new DshError('http', `DSH remote mux WebSocket HTTP ${status === undefined ? 'error' : status}`, status === undefined ? {} : { status });
-            ended = true;
-            settle(undefined);
-        };
-        socket.onclose = () => {
-            if (ended)
-                return;
-            ended = true;
-            settle(undefined);
-        };
-        const onAbort = () => {
-            if (ended)
-                return;
-            ended = true;
-            settle(undefined);
-            try {
-                socket.close();
-            }
-            catch {
-                /* ignore close error */
-            }
-        };
-        signal.addEventListener('abort', onAbort, { once: true });
-        const next = () => new Promise((resolve) => {
-            if (queue.length > 0) {
-                resolve(queue.shift());
-                return;
-            }
-            if (ended) {
-                resolve(undefined);
-                return;
-            }
-            waiter = resolve;
+        yield* openMuxStream({
+            baseUrl: this.baseUrl,
+            endpoint,
+            payload,
+            signal,
+            requestTimeoutMs: this.requestTimeoutMs,
+            authCookie: () => this.authCookie(),
+            webSocketFactory: this.webSocketImpl,
         });
-        try {
-            while (!signal.aborted) {
-                const frame = await next();
-                if (frame === undefined) {
-                    if (failure && !signal.aborted)
-                        throw failure;
-                    return;
-                }
-                yield frame;
-            }
-        }
-        finally {
-            clearTimeout(connectTimer);
-            signal.removeEventListener('abort', onAbort);
-            try {
-                socket.close();
-            }
-            catch {
-                /* ignore close error */
-            }
-        }
     }
     /** One logical `session/follow` stream. */
     async *followStream(sessionId, signal) {

package/dist/runner/dsh/daemon.d.ts

@@ -28,8 +28,6 @@ interface SpawnedDaemon {
     failure(): Error | undefined;
     exited(): boolean;
 }
-/** Resolve the same Harness home DSH resolves: configured, env, then ~/.dsh. */
-export declare function resolveDshHome(configured?: string, env?: NodeJS.ProcessEnv): string;
 /** True only for the loopback HTTP address this process may start and probe. */
 export declare function isLoopbackHttpUrl(value: string): boolean;
 /**

package/dist/runner/dsh/daemon.js

@@ -12,10 +12,10 @@
  */
 import fs from 'node:fs';
 import fsp from 'node:fs/promises';
-import os from 'node:os';
 import path from 'node:path';
 import { DEFAULT_DSH_HOST } from '../../config/index.js';
 import { mergeProcessEnv, spawnProcess } from '../../platform/spawn.js';
+import { resolveDshHome } from './home.js';
 const DEFAULT_START_TIMEOUT_MS = 30_000;
 const READY_POLL_MS = 100;
 /** User-facing daemon failure; the bridge renders `message` in the chat card. */
@@ -30,11 +30,6 @@ export class DshDaemonError extends Error {
 function stripTrailingSlash(value) {
     return value.replace(/\/+$/, '');
 }
-/** Resolve the same Harness home DSH resolves: configured, env, then ~/.dsh. */
-export function resolveDshHome(configured, env = process.env) {
-    const value = configured?.trim() || env.DSH_HOME?.trim();
-    return path.resolve(value && value.length > 0 ? value : path.join(os.homedir(), '.dsh'));
-}
 /** True only for the loopback HTTP address this process may start and probe. */
 export function isLoopbackHttpUrl(value) {
     try {