dsh-remote-local-plugin 0.8.8 → 0.8.9

package/lib/index.js

@@ -1,4 +1,4 @@
-/* dsh-remote-local-plugin@0.8.8 — bundled host entry */
+/* dsh-remote-local-plugin@0.8.9 — bundled host entry */
 
 // src/index.ts
 import { credentialRef } from "@deepseek-ai/dsh-credentials";
@@ -269,7 +269,7 @@ async function handleHostApi(ctx, service, mirrors, request) {
 async function dispatch(ctx, service, mirrors, endpoint, payload, signal) {
   switch (endpoint) {
     case "state":
-      return service.state();
+      return { ...service.state(), mirroredWorkspaceIds: mirrors?.localWorkspaceIds() ?? [] };
     case "target/validate":
       return service.validateTarget(requireStringField(payload, "sshTarget"));
     case "host/add": {
@@ -504,12 +504,83 @@ var SURFACE_TYPES = /* @__PURE__ */ new Set([
   "assistant/message",
   "tool/result"
 ]);
+function messageIdentity(message) {
+  return typeof message === "object" && message !== null ? message.id : void 0;
+}
+function createMirrorInbox(session) {
+  const nextTurn = [];
+  const nextStep = [];
+  const locate = (id) => {
+    for (const target of ["next-turn", "next-step"]) {
+      const list = target === "next-turn" ? nextTurn : nextStep;
+      const index = list.findIndex((message) => messageIdentity(message) === id);
+      if (index >= 0) return { target, index };
+    }
+    return void 0;
+  };
+  const append = (target, start, inserted, removedCount = 0) => {
+    try {
+      ;
+      session.append("agent/inbox/spliced", {
+        target,
+        start,
+        ...removedCount === 0 ? {} : { removedCount },
+        inserted
+      });
+    } catch {
+    }
+  };
+  const inbox = {
+    "next-turn": nextTurn,
+    "next-step": nextStep,
+    nextTurn,
+    nextStep,
+    get hasPending() {
+      return nextTurn.length > 0 || nextStep.length > 0;
+    },
+    remove(id) {
+      const found = locate(id);
+      if (found === void 0) return false;
+      const list = found.target === "next-turn" ? nextTurn : nextStep;
+      list.splice(found.index, 1);
+      append(found.target, found.index, [], 1);
+      return true;
+    },
+    replace(id, message) {
+      const found = locate(id);
+      if (found === void 0) return false;
+      const list = found.target === "next-turn" ? nextTurn : nextStep;
+      list.splice(found.index, 1, message);
+      append(found.target, found.index, [message], 1);
+      return true;
+    },
+    splice(target, start, deleteCount, inserted) {
+      const list = target === "next-turn" ? nextTurn : nextStep;
+      const removed = list.splice(start, deleteCount, ...inserted);
+      append(target === "next-turn" ? "next-turn" : "next-step", start, inserted, removed.length);
+      return removed;
+    },
+    clear() {
+      if (nextStep.length > 0) {
+        const count = nextStep.length;
+        nextStep.length = 0;
+        append("next-step", 0, [], count);
+      }
+      if (nextTurn.length > 0) {
+        const count = nextTurn.length;
+        nextTurn.length = 0;
+        append("next-turn", 0, [], count);
+      }
+    }
+  };
+  return inbox;
+}
 var RemoteMirrorAgent = class {
   id;
   session;
   options;
   ctx;
-  inbox = { "next-turn": [], "next-step": [], nextTurn: [], nextStep: [] };
+  inbox;
   #runtime;
   #mirror;
   constructor(mirror, runtime, ctx, options) {
@@ -519,11 +590,13 @@ var RemoteMirrorAgent = class {
     this.session = runtime.session;
     this.ctx = ctx;
     this.options = options;
+    this.inbox = createMirrorInbox(runtime.session);
   }
   get status() {
     return this.#runtime.running ? "running" : "idle";
   }
   cancel() {
+    this.inbox.clear();
     this.#mirror.cancel(this.#runtime);
   }
   whenIdle() {
@@ -536,10 +609,14 @@ var RemoteMirrorAgent = class {
     return task(new AbortController().signal);
   }
   send(message, _target, wakeup = false) {
-    if (wakeup) this.followup(message);
+    if (wakeup || this.#runtime.running) this.followup(message);
     else this.#mirror.prompt(this.#runtime, message, "queue");
   }
   followup(message) {
+    if (this.#runtime.running) {
+      this.inbox.splice("next-turn", this.inbox.nextTurn.length, 0, [message]);
+      return;
+    }
     this.#mirror.prompt(this.#runtime, message, "queue");
   }
   steer(message) {
@@ -643,6 +720,10 @@ var RemoteMirrorService = class {
     }
     return void 0;
   }
+  /** Local workspace ids that represent remote workspaces. */
+  localWorkspaceIds() {
+    return Object.values(this.#state.workspaces).map((workspace) => workspace.localWorkspaceId).filter((id) => typeof id === "string" && id !== "");
+  }
   /** Whether the test-only manifest excludes this remote workspace from UI listings. */
   isTestHidden(remoteWorkspaceId, remotePath) {
     return isTestHidden(remotePath, remoteWorkspaceId, this.#testVisibility);
@@ -680,9 +761,10 @@ var RemoteMirrorService = class {
   }
   /** Route one prompt from the local Agent façade to the remote session. */
   prompt(runtime, message, mode) {
-    const text = contentText(message);
-    if (text === "") return;
-    runtime.pendingUsers.push(message);
+    const parts = promptParts(message);
+    if (parts.length === 0) return;
+    const pending = { message, localSeq: -1 };
+    runtime.pendingUsers.push(pending);
     if (!runtime.running) {
       runtime.awaitingTurn = runtime.latestTurn + 1;
       runtime.awaitingStarted = false;
@@ -697,19 +779,63 @@ var RemoteMirrorService = class {
     }
     const selection = this.#selectionFor(runtime);
     if (selection !== void 0) Object.assign(runtime.agent.options, selection);
-    void this.#hosts.promptSession(
+    void this.#promptContent(message).then(({ text, content }) => this.#hosts.promptSession(
       runtime.record.hostId,
       runtime.record.remoteSessionId,
       text,
       mode,
-      selection
-    ).catch((error) => {
+      selection,
+      content
+    )).then(() => {
+      if (!runtime.pendingUsers.includes(pending)) return;
+      const before = runtime.session.seq;
+      try {
+        runtime.session.append("user/message", messageData(message), { surfaceOp: "append" });
+        pending.localSeq = runtime.session.seq > before ? runtime.session.seq - 1 : -1;
+      } catch (error) {
+        this.#ctx.logger.warn("dsh-remote-local: could not append accepted user message: %s", String(error));
+      }
+    }).catch((error) => {
       runtime.lastError = error instanceof Error ? error.message : String(error);
-      runtime.pendingUsers.shift();
+      const index = runtime.pendingUsers.indexOf(pending);
+      if (index >= 0) runtime.pendingUsers.splice(index, 1);
       this.#ctx.logger.warn("dsh-remote-local: remote prompt failed: %s", runtime.lastError);
+      try {
+        const emit = this.#ctx.emit;
+        emit.call(this.#ctx, "agent/error", {
+          agent: runtime.agent,
+          error: error instanceof Error ? error : new Error(String(error))
+        });
+      } catch (emitError) {
+        this.#ctx.logger.warn("dsh-remote-local: prompt error notification failed: %s", String(emitError));
+      }
       this.#setRunning(runtime, false);
     });
   }
+  async #promptContent(message) {
+    const content = [];
+    for (const part of promptParts(message)) {
+      if (part.type === "text") {
+        content.push({ type: "text", text: part.text });
+        continue;
+      }
+      const attachments = this.#ctx.get("attachments");
+      if (attachments === void 0) throw new Error("\u672C\u5730\u9644\u4EF6\u670D\u52A1\u4E0D\u53EF\u7528");
+      const stored = await attachments.readImage(part.attachment);
+      const mediaType = typeof stored.mediaType === "string" ? stored.mediaType : typeof stored.ref?.mediaType === "string" ? stored.ref.mediaType : void 0;
+      if (mediaType === void 0) throw new Error("\u56FE\u7247\u7F3A\u5C11 mediaType");
+      const name2 = part.name ?? (typeof stored.ref?.name === "string" ? stored.ref.name : void 0);
+      content.push({
+        type: "image",
+        data: Buffer.from(stored.data).toString("base64"),
+        mediaType,
+        ...name2 === void 0 ? {} : { name: name2 }
+      });
+    }
+    const text = content.filter((part) => part.type === "text").map((part) => part.text).join("\n").trim();
+    if (content.length === 0) throw new Error("\u6D88\u606F\u5185\u5BB9\u4E3A\u7A7A");
+    return { text, content };
+  }
   /** Route cancellation to the remote session only after the remote accepts it. */
   cancel(runtime) {
     void this.#hosts.cancelSession(runtime.record.hostId, runtime.record.remoteSessionId).then(() => {
@@ -1044,9 +1170,13 @@ var RemoteMirrorService = class {
     let session;
     try {
       const seed = filtered.map((event, index) => toSeedEvent(event, index, seqMap));
+      const remoteCreatedAt = Date.parse(remote.createdAt);
       session = this.#sessions.create(localId, {
         ...seed.length === 0 ? {} : { seed },
-        meta: { cwd: anchor }
+        meta: {
+          cwd: anchor,
+          ...Number.isFinite(remoteCreatedAt) ? { createdAt: remoteCreatedAt } : {}
+        }
       });
     } catch (error) {
       this.#ctx.logger.warn("dsh-remote-local: could not seed mirror for %s: %s", remote.sessionId, String(error));
@@ -1221,15 +1351,19 @@ var RemoteMirrorService = class {
   #appendEvent(runtime, event) {
     const before = runtime.session.seq;
     runtime.applyingRemote = true;
+    let mappedSeq;
     try {
       if (!isMirrorNoise(event.type)) {
-        appendRemoteEvent(runtime.session, remapRemoteEvent(event, runtime.remoteToLocalSeq), runtime);
+        mappedSeq = appendRemoteEvent(runtime.session, remapRemoteEvent(event, runtime.remoteToLocalSeq), runtime);
       }
     } finally {
       runtime.applyingRemote = false;
     }
     const after = runtime.session.seq;
-    if (after > before) {
+    if (mappedSeq !== void 0) {
+      runtime.remoteToLocalSeq.set(event.seq, mappedSeq);
+      this.#flushAssistantEnd(runtime, event.seq);
+    } else if (after > before) {
       runtime.remoteToLocalSeq.set(event.seq, after - 1);
       this.#flushAssistantEnd(runtime, event.seq);
     }
@@ -1237,6 +1371,7 @@ var RemoteMirrorService = class {
     if (typeof turn !== "number") return;
     if (event.type === "turn/start") {
       runtime.latestTurn = Math.max(runtime.latestTurn, turn);
+      this.#setRunning(runtime, true);
       return;
     }
     if (event.type !== "turn/end") return;
@@ -1245,6 +1380,16 @@ var RemoteMirrorService = class {
       runtime.awaitingTurn = null;
       runtime.awaitingStarted = false;
       this.#setRunning(runtime, false);
+      const reason = typeof event.data === "object" && event.data !== null ? event.data.reason?.kind : void 0;
+      if (reason === "aborted") {
+        runtime.agent.inbox.clear();
+      } else if (runtime.agent.inbox.hasPending) {
+        const next = runtime.agent.inbox.nextTurn[0];
+        if (next !== void 0) {
+          runtime.agent.inbox.remove(messageIdentity(next));
+          this.prompt(runtime, next, "queue");
+        }
+      }
     }
   }
   #onLocalSessionEvent(session, event) {
@@ -1459,11 +1604,8 @@ function appendRemoteEvent(session, event, runtime) {
   if (event.type === "user/message" && runtime.pendingUsers.length > 0) {
     const source = event.data.source;
     if (source?.kind === "user") {
-      const message = runtime.pendingUsers.shift();
-      if (message !== void 0) {
-        session.append("user/message", messageData(message), { surfaceOp: "append" });
-        return;
-      }
+      const pending = runtime.pendingUsers.shift();
+      if (pending !== void 0 && pending.localSeq >= 0) return pending.localSeq;
     }
   }
   const append = session.append.bind(session);
@@ -1476,6 +1618,7 @@ function appendRemoteEvent(session, event, runtime) {
   } else {
     append(event.type, event.data);
   }
+  return void 0;
 }
 function messageData(message) {
   if (typeof message !== "object" || message === null) return message;
@@ -1544,20 +1687,25 @@ function latestRemoteSandboxMode(events) {
   }
   return void 0;
 }
-function contentText(message) {
-  if (typeof message === "string") return message;
-  if (typeof message !== "object" || message === null) return "";
+function promptParts(message) {
+  if (typeof message !== "object" || message === null) return [];
   const content = message.content;
-  if (!Array.isArray(content)) return "";
-  const texts = [];
+  if (!Array.isArray(content)) return [];
+  const parts = [];
   for (const part of content) {
-    if (typeof part === "string") texts.push(part);
-    else if (typeof part === "object" && part !== null && part.type === "text") {
+    if (typeof part === "object" && part !== null && part.type === "text") {
       const text = part.text;
-      if (typeof text === "string") texts.push(text);
+      if (typeof text === "string" && text.trim() !== "") parts.push({ type: "text", text });
+      continue;
+    }
+    if (typeof part === "object" && part !== null && part.type === "image") {
+      const attachment = part.attachment;
+      if (attachment === void 0) continue;
+      const name2 = attachment.name;
+      parts.push({ type: "image", attachment, ...typeof name2 === "string" ? { name: name2 } : {} });
     }
   }
-  return texts.join("\n").trim();
+  return parts;
 }
 function canonicalPath(path) {
   try {
@@ -1762,6 +1910,15 @@ function targetOf(mirrors, workspaceRoot, path) {
       workspaceRoot: anchor
     };
   }
+  if (isAbsolute2(path)) {
+    return {
+      hostId: context.hostId,
+      localPath: path,
+      remotePath: path,
+      relativePath: path,
+      workspaceRoot: anchor
+    };
+  }
   throw Object.assign(
     new Error(`remote file path is outside the mirrored workspace: ${path}`),
     { code: "workspace-file/not-found" }
@@ -4601,12 +4758,13 @@ var RemoteHostsService = class {
     }
   }
   /** Send a prompt to a remote session. */
-  async promptSession(id, sessionId, text, mode, selection) {
+  async promptSession(id, sessionId, text, mode, selection, content) {
     const client = this.#requireClient(id);
     try {
       await client.promptSession(sessionId, {
         text,
         ...mode === void 0 ? {} : { mode },
+        ...content === void 0 ? {} : { content },
         ...selection === void 0 ? {} : selection
       });
       return { accepted: true };

package/lib/types/host-api/contract.d.ts

@@ -17,6 +17,8 @@ export type HostApiEndpoint = 'state' | 'target/validate' | 'host/add' | 'host/r
 export interface RemoteHostsState {
     readonly protocolVersion: number;
     readonly hosts: readonly HostView[];
+    /** Local workspace ids whose Session creation is owned by a remote host. */
+    readonly mirroredWorkspaceIds: readonly string[];
 }
 /** Result of parsing a destination. */
 export interface ValidatedTarget {

package/lib/types/mirror/service.d.ts

@@ -25,6 +25,10 @@ interface MirrorRecord {
     lastSeq: number;
     updatedAt: string;
 }
+interface PendingUser {
+    readonly message: unknown;
+    localSeq: number;
+}
 interface MirrorRuntime {
     readonly record: MirrorRecord;
     readonly agent: MirrorAgent;
@@ -41,7 +45,7 @@ interface MirrorRuntime {
     running: boolean;
     stopped: boolean;
     lastError: string | null;
-    pendingUsers: unknown[];
+    pendingUsers: PendingUser[];
     waiters: Array<() => void>;
 }
 interface MirrorAgent {
@@ -53,7 +57,7 @@ interface MirrorAgent {
         reasoningEffort?: string;
     };
     readonly ctx: Context;
-    readonly inbox: Record<string, unknown[]>;
+    readonly inbox: MirrorInbox;
     readonly status: 'idle' | 'running';
     cancel(cause?: unknown): void;
     whenIdle(): Promise<void>;
@@ -63,6 +67,17 @@ interface MirrorAgent {
     steer(message: unknown): void;
     inject(message: unknown): void;
 }
+interface MirrorInbox {
+    readonly 'next-turn': unknown[];
+    readonly 'next-step': unknown[];
+    readonly nextTurn: unknown[];
+    readonly nextStep: unknown[];
+    readonly hasPending: boolean;
+    remove(id: unknown): boolean;
+    replace(id: unknown, message: unknown): boolean;
+    splice(target: string, start: number, deleteCount: number, inserted: unknown[]): unknown[];
+    clear(): void;
+}
 /** Mirror remote sessions into local Sessions and custom Agents. */
 export declare class RemoteMirrorService {
     #private;
@@ -79,6 +94,8 @@ export declare class RemoteMirrorService {
         remoteRoot: string;
         anchor: string;
     } | undefined;
+    /** Local workspace ids that represent remote workspaces. */
+    localWorkspaceIds(): string[];
     /** Whether the test-only manifest excludes this remote workspace from UI listings. */
     isTestHidden(remoteWorkspaceId: string, remotePath: string): boolean;
     /** Find the local mirror workspace for one remote workspace. */

package/lib/types/service.d.ts

@@ -84,7 +84,7 @@ export declare class RemoteHostsService {
         provider: string;
         model: string;
         reasoningEffort?: string;
-    }): Promise<AcceptedResult>;
+    }, content?: readonly import('@dsh-remote/protocol').PromptContentPart[]): Promise<AcceptedResult>;
     /** Cancel a remote session's active turn. */
     cancelSession(id: string, sessionId: string): Promise<AcceptedResult>;
     /** SSH invocation facts for auxiliary remote file/terminal adapters. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-remote-local-plugin",
-  "version": "0.8.8",
+  "version": "0.8.9",
   "description": "DSH remote-development local plugin: host registry, SSH tunnels, remote workspace/session discovery, an authenticated Connection RPC surface, agent tools, and a Settings page.",
   "keywords": [
     "dsh",