ds-harness-remote 0.4.4 → 0.4.6

package/dist/index.js

@@ -14529,9 +14529,15 @@ var CodexVirtualHarness = class _CodexVirtualHarness {
         case "session/selectModel":
           return business(await this.selectModel(requestArg(args), signal));
         case "session/canOpenWorkspacePath":
-          return business(false);
+          return business(this.selectedWorkspaceId !== void 0);
         case "session/openWorkspacePath":
           return business(failure("bad-request", "Opening Host paths is unavailable in CodeX mode."));
+        case "host/describe":
+          return business(success(await this.describeHost(signal)));
+        case "host/listDirectory":
+          return business(await this.listDirectory(requestArg(args), signal));
+        case "directoryPicker/list":
+          return business(await this.listDirectory(requestArg(args), signal));
         case "skills/list":
           return business(success({ items: [] }));
         case "commands/list":
@@ -15223,6 +15229,46 @@ var CodexVirtualHarness = class _CodexVirtualHarness {
     const workspace = catalog.workspaces.find((item) => sessionId !== void 0 && item.sessionIds.includes(sessionId));
     return workspace === void 0 ? failure("workspace-not-found", "The CodeX virtual Workspace was not found.") : success({ workspace: nativeWorkspace(workspace) });
   }
+  selectedWorkspace(catalog) {
+    return this.selectedWorkspaceId === void 0 ? void 0 : catalog.workspaces.find((item) => item.workspaceId === this.selectedWorkspaceId);
+  }
+  async describeHost(signal) {
+    const catalog = await this.currentCatalog(signal);
+    const workspace = this.selectedWorkspace(catalog);
+    const models = await this.models(signal).catch(() => void 0);
+    return {
+      version: "CodeX Remote",
+      cwd: workspace?.path ?? "",
+      home: workspace?.path ?? "",
+      provider: "CodeX",
+      ...models === void 0 ? {} : { model: models.default.model },
+      attachedSessions: catalog.sessions.length,
+      canOpenPath: workspace !== void 0
+    };
+  }
+  async listDirectory(request, signal) {
+    const catalog = await this.currentCatalog(signal);
+    const workspace = this.selectedWorkspace(catalog);
+    if (workspace === void 0) return failure("workspace-not-found", "The CodeX virtual Workspace was not found.");
+    const path = string(request.path) ?? workspace.path;
+    if (!containsPath(workspace.path, path)) {
+      return failure("workspace-not-found", "The selected directory is outside the current CodeX virtual Workspace.");
+    }
+    const listing = record(await this.client.request("dsh/directoryList", { path }, signal));
+    if (!isCodexDirectoryListing(listing)) {
+      return failure("internal", "CodeX Remote returned an invalid directory listing.");
+    }
+    const listedPaths = [
+      listing.path,
+      listing.home,
+      ...listing.crumbs.map((item) => item.path),
+      ...listing.entries.map((item) => item.path)
+    ];
+    if (listedPaths.some((path2) => !containsPath(workspace.path, path2))) {
+      return failure("internal", "CodeX Remote returned a directory outside the current Workspace.");
+    }
+    return success(listing);
+  }
   async archiveSession(request, signal) {
     const sessionId = requiredString(request.sessionId, "sessionId");
     await this.client.request("thread/archive", { threadId: nativeThreadId(sessionId) }, signal);
@@ -15233,8 +15279,12 @@ var CodexVirtualHarness = class _CodexVirtualHarness {
   async createSession(request, signal) {
     const catalog = await this.currentCatalog(signal);
     const workspaceId = string(request.workspaceId) ?? this.selectedWorkspaceId;
-    const cwd = string(request.cwd) ?? (workspaceId === void 0 ? void 0 : catalog.workspaces.find((item) => item.workspaceId === workspaceId)?.path);
+    const workspace = workspaceId === void 0 ? void 0 : catalog.workspaces.find((item) => item.workspaceId === workspaceId);
+    const cwd = string(request.cwd) ?? workspace?.path;
     if (cwd === void 0) return failure("workspace-not-found", "The CodeX virtual Workspace was not found.");
+    if (workspace !== void 0 && !containsPath(workspace.path, cwd)) {
+      return failure("workspace-not-found", "The selected directory is outside the current CodeX virtual Workspace.");
+    }
     const directory = await this.models(signal);
     const selection = directory.default;
     const requestedPreset = CODEX_DEFAULT_PERMISSION;
@@ -15540,7 +15590,10 @@ var CodexVirtualHarness = class _CodexVirtualHarness {
         archiveSession: call("workspace.archiveSession")
       },
       subagents: {},
-      host: {},
+      host: {
+        describe: call("host.describe"),
+        listDirectory: call("host.listDirectory")
+      },
       skills: { list: call("skills.list") },
       agentPresets: {},
       goals: {},
@@ -16530,6 +16583,14 @@ function business(value) {
   }
   return ok(value);
 }
+function isCodexDirectoryListing(value) {
+  const listing = record(value);
+  return typeof listing.path === "string" && typeof listing.home === "string" && Array.isArray(listing.crumbs) && listing.crumbs.every(isCodexDirectoryEntry) && Array.isArray(listing.entries) && listing.entries.every(isCodexDirectoryEntry) && typeof listing.truncated === "boolean";
+}
+function isCodexDirectoryEntry(value) {
+  const entry = record(value);
+  return typeof entry.name === "string" && typeof entry.path === "string" && typeof entry.hidden === "boolean";
+}
 function fail(code, message, details = {}) {
   return { ok: false, error: { code, message, details } };
 }
@@ -16764,7 +16825,7 @@ function normalizeServerUrl(value) {
 }
 
 // src/version.ts
-var PLUGIN_VERSION = "0.4.4";
+var PLUGIN_VERSION = "0.4.6";
 
 // src/server-api.ts
 var TERMINAL_CONTROL_CHARACTERS = /[\u0000-\u001f\u007f-\u009f]/u;
@@ -19370,24 +19431,24 @@ var IdentityStore = class {
     }
     if (!hasDevice) {
       const keys = generateKeyPair();
-      const record4 = { schemaVersion: 1, deviceId: uuidV7(), name: deviceName, publicKey: keys.publicKey };
-      await atomicJsonWrite(devicePath, record4, 384);
+      const record5 = { schemaVersion: 1, deviceId: uuidV7(), name: deviceName, publicKey: keys.publicKey };
+      await atomicJsonWrite(devicePath, record5, 384);
       await atomicTextWrite(keyPath, `${keys.privateKey}
 `, 384);
     }
     await assertPrivateMode(keyPath);
     try {
-      let record4 = identitySchema.parse(JSON.parse(await readFile(devicePath, "utf8")));
+      let record5 = identitySchema.parse(JSON.parse(await readFile(devicePath, "utf8")));
       const privateKey = (await readFile(keyPath, "utf8")).trim();
       const regenerated = generateKeyPair(fromBase64Url2(privateKey));
-      if (regenerated.publicKey !== record4.publicKey) {
+      if (regenerated.publicKey !== record5.publicKey) {
         throw new IdentityInvalidError("device public and private keys do not match");
       }
-      if (record4.name !== deviceName) {
-        record4 = { ...record4, name: deviceName };
-        await atomicJsonWrite(devicePath, record4, 384);
+      if (record5.name !== deviceName) {
+        record5 = { ...record5, name: deviceName };
+        await atomicJsonWrite(devicePath, record5, 384);
       }
-      this.identity = { ...record4, privateKey, fingerprint: fingerprint(record4.publicKey) };
+      this.identity = { ...record5, privateKey, fingerprint: fingerprint(record5.publicKey) };
       await this.loadPeers();
       return this.identity;
     } catch (error) {
@@ -19529,10 +19590,10 @@ var ServerCredentialStore = class {
     return parsed.serverUrl === serverUrl && parsed.deviceId === deviceId ? parsed : void 0;
   }
   async save(credentials) {
-    const record4 = credentialSchema.parse({ schemaVersion: 1, ...credentials });
-    await atomicWrite(this.path, `${JSON.stringify(record4, null, 2)}
+    const record5 = credentialSchema.parse({ schemaVersion: 1, ...credentials });
+    await atomicWrite(this.path, `${JSON.stringify(record5, null, 2)}
 `);
-    return record4;
+    return record5;
   }
   async clear() {
     await rm2(this.path, { force: true });
@@ -21334,6 +21395,9 @@ var commandExecuteSchema = external_exports.object({
 var commandListSchema = external_exports.object({
   agentId: external_exports.string().min(1).max(128)
 }).strict();
+var directoryListSchema = external_exports.object({
+  path: external_exports.string().min(1).max(4096).optional()
+}).strict();
 var credentialRefSchema = external_exports.string().regex(/^[A-Za-z_][A-Za-z0-9_]*$/, "Invalid credential reference name").max(128);
 var CONFIG_PLANE_SETTINGS_BYTES = 64 * 1024;
 var CONFIG_PLANE_MAX_OPS = 64;
@@ -21463,10 +21527,18 @@ var HarnessApiBridge = class {
   answer;
   async call(input2) {
     const params = callSchema2.parse(input2);
+    const signal = AbortSignal.timeout(NATIVE_CALL_TIMEOUT_MS);
     const method = this.methods.get(params.method);
-    if (method === void 0) throw deniedMethod(params.method);
+    if (method === void 0) {
+      if (params.method === "host.listDirectory") {
+        return this.callDirectoryFallback(params, signal);
+      }
+      if (params.method === "host.describe") {
+        return this.describeFallback(params.rpcId);
+      }
+      throw deniedMethod(params.method);
+    }
     const startedAt = performance.now();
-    const signal = AbortSignal.timeout(NATIVE_CALL_TIMEOUT_MS);
     const request = { rpcId: params.rpcId, payload: params.payload };
     try {
       const callWithTimeout = (overridePayload) => withTimeout(
@@ -21481,11 +21553,11 @@ var HarnessApiBridge = class {
         response = await callWithTimeout(request.payload);
       }
       if (params.method === "host.listDirectory" && needsRemoteDirectoryFallback(response)) {
-        const payload = typeof params.payload === "object" && params.payload !== null ? params.payload : {};
-        const value = await listRemoteDirectory(typeof payload.path === "string" ? payload.path : void 0, signal);
-        response = { rpcId: params.rpcId, result: { ok: true, value } };
+        response = await this.callDirectoryFallback(params, signal);
+      }
+      if (params.method === "host.describe") {
+        response = normalizeHostDescribe(response, this.harnessVersion, true);
       }
-      if (params.method === "host.describe") response = normalizeHostDescribeVersion(response, this.harnessVersion);
       this.logger?.debug("harness api call ok", {
         method: params.method,
         durationMs: Math.round(performance.now() - startedAt)
@@ -21502,6 +21574,26 @@ var HarnessApiBridge = class {
       throw error;
     }
   }
+  async callDirectoryFallback(params, signal) {
+    const payload = directoryListSchema.parse(params.payload);
+    const value = await listRemoteDirectory(payload.path, signal);
+    return { rpcId: params.rpcId, result: { ok: true, value } };
+  }
+  describeFallback(rpcId) {
+    return {
+      rpcId,
+      result: {
+        ok: true,
+        value: {
+          version: this.harnessVersion ?? "0.0.1",
+          cwd: "",
+          home: "",
+          attachedSessions: 0,
+          canOpenPath: true
+        }
+      }
+    };
+  }
   openTransfer(input2) {
     this.pruneTransfers();
     const params = transferOpenSchema.parse(input2);
@@ -21716,8 +21808,8 @@ function needsRemoteDirectoryFallback(response) {
   const result = response.result;
   return typeof result === "object" && result !== null && "ok" in result && result.ok === false && "error" in result && typeof result.error === "object" && result.error !== null && "code" in result.error && result.error.code === "directory-picker-unavailable";
 }
-function normalizeHostDescribeVersion(response, harnessVersion) {
-  if (!response.result.ok || harnessVersion === void 0) return response;
+function normalizeHostDescribe(response, harnessVersion, canListDirectory) {
+  if (!response.result.ok) return response;
   const value = response.result.value;
   if (typeof value !== "object" || value === null || Array.isArray(value)) return response;
   const description = value;
@@ -21725,12 +21817,19 @@ function normalizeHostDescribeVersion(response, harnessVersion) {
     normalizeHarnessVersion(description.version),
     harnessVersion
   );
-  if (selectedVersion === void 0 || description.version === selectedVersion) return response;
+  const versionChanged = selectedVersion !== void 0 && description.version !== selectedVersion;
+  const canOpenPathChanged = canListDirectory && description.canOpenPath !== true;
+  if (!versionChanged && !canOpenPathChanged) return response;
+  const normalized = {
+    ...description,
+    ...versionChanged ? { version: selectedVersion } : {},
+    ...canOpenPathChanged ? { canOpenPath: true } : {}
+  };
   return {
     ...response,
     result: {
       ...response.result,
-      value: { ...description, version: selectedVersion }
+      value: normalized
     }
   };
 }
@@ -22061,6 +22160,9 @@ var transferReadSchema2 = external_exports.object({
   transferId: external_exports.string().uuid(),
   index: external_exports.number().int().nonnegative()
 }).strict();
+var directoryListSchema2 = external_exports.object({
+  path: external_exports.string().min(1).max(4096).optional()
+}).strict();
 var MAX_ACTIVE_STREAMS = 16;
 var MAX_ACTIVE_TRANSFERS = 2;
 var TRANSFER_IDLE_MS = 2 * 6e4;
@@ -22093,6 +22195,7 @@ var HARNESS_REMOTE_ALLOWLIST = [
   "pluginInventory/list",
   "session/attachment",
   "session/cancel",
+  "session/canOpenWorkspacePath",
   "session/control",
   "session/create",
   "session/follow",
@@ -22135,15 +22238,29 @@ var HarnessRemoteBridge = class {
   async call(input2) {
     const params = callSchema3.parse(input2);
     this.assertAllowed(params.endpoint);
+    if (params.endpoint === "session/canOpenWorkspacePath") {
+      return { ok: true, value: true };
+    }
     const startedAt = performance.now();
+    const signal = AbortSignal.timeout(6e4);
     try {
-      const result = await this.gateway.dispatch(params.endpoint, params.payload, AbortSignal.timeout(6e4));
+      const nativeResult = await this.gateway.dispatch(params.endpoint, params.payload, signal);
+      const result = params.endpoint === "directoryPicker/list" && needsDirectoryFallback(nativeResult) ? await this.directoryList(params.payload, signal) : nativeResult;
       this.logger?.debug("harness remote call ok", {
         endpoint: params.endpoint,
         durationMs: Math.round(performance.now() - startedAt)
       });
       return result;
     } catch (error) {
+      if (params.endpoint === "directoryPicker/list") {
+        const result = await this.directoryList(params.payload, signal);
+        this.logger?.debug("harness remote call ok", {
+          endpoint: params.endpoint,
+          durationMs: Math.round(performance.now() - startedAt),
+          fallback: "directory-browser"
+        });
+        return result;
+      }
       this.logger?.warn("harness remote call failed", {
         endpoint: params.endpoint,
         durationMs: Math.round(performance.now() - startedAt),
@@ -22152,6 +22269,11 @@ var HarnessRemoteBridge = class {
       throw error;
     }
   }
+  async directoryList(payload, signal) {
+    const args = requestArgs(payload);
+    const params = directoryListSchema2.parse(args);
+    return { ok: true, value: await listRemoteDirectory(params.path, signal) };
+  }
   openTransfer(input2) {
     this.pruneTransfers();
     const params = transferOpenSchema2.parse(input2);
@@ -22335,12 +22457,29 @@ function concatChunks2(chunks, totalBytes) {
   }
   return result;
 }
+function needsDirectoryFallback(result) {
+  if (result.ok) return false;
+  const code = result.error.code.toLocaleLowerCase();
+  const message = result.error.message.toLocaleLowerCase();
+  return code.includes("capability") || code === "directory-picker-unavailable" || message.includes("browser capability") || message.includes("brower capability") || message.includes("directory-picker-unavailable");
+}
+function requestArgs(payload) {
+  const root = record4(payload);
+  const args = isRecord7(root.args) ? root.args : root;
+  return record4(args.request ?? args._request ?? args);
+}
+function record4(value) {
+  return isRecord7(value) ? value : {};
+}
+function isRecord7(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
 
 // src/codex/domain.ts
 import { randomUUID } from "node:crypto";
-import { realpath, stat as stat4 } from "node:fs/promises";
+import { readdir as readdir2, realpath, stat as stat4 } from "node:fs/promises";
 import { homedir as homedir3 } from "node:os";
-import { isAbsolute as isAbsolute3, join as join5, resolve as resolve2 } from "node:path";
+import { basename as basename3, isAbsolute as isAbsolute3, join as join5, relative, resolve as resolve2 } from "node:path";
 
 // src/codex/app-server.ts
 import { spawn as spawn2 } from "node:child_process";
@@ -22526,7 +22665,7 @@ var CodexAppServerClient = class {
       this.handleProcessFailure("CODEX_INVALID_RESPONSE", new Error("Codex App Server emitted invalid JSON."));
       return;
     }
-    if (!isRecord7(value)) {
+    if (!isRecord8(value)) {
       this.handleProcessFailure("CODEX_INVALID_RESPONSE", new Error("Codex App Server emitted an invalid message."));
       return;
     }
@@ -22571,12 +22710,12 @@ var CodexAppServerClient = class {
   }
 };
 function safeUpstreamError(value) {
-  if (!isRecord7(value) || typeof value.message !== "string") return "Codex App Server rejected the request.";
+  if (!isRecord8(value) || typeof value.message !== "string") return "Codex App Server rejected the request.";
   const message = value.message.toLowerCase();
   if (message.includes("active writer")) return "Codex thread already has an active writer.";
   return message.includes("not initialized") ? "Codex App Server is not initialized." : "Codex App Server rejected the request.";
 }
-function isRecord7(value) {
+function isRecord8(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
@@ -22629,6 +22768,9 @@ var schemas = {
     throughSeq: external_exports.number().int().min(-1).optional(),
     maxMessages: external_exports.number().int().min(1).max(200).optional()
   }).strict(),
+  "dsh/directoryList": external_exports.object({
+    path: external_exports.string().min(1).max(4096)
+  }).strict(),
   "thread/start": external_exports.object({
     cwd: external_exports.string().min(1).max(4096),
     model: external_exports.string().min(1).max(128).optional(),
@@ -22935,15 +23077,15 @@ function decodeCanonicalBase643(value) {
   }
   return decoded;
 }
-function isRecord8(value) {
+function isRecord9(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function safeErrorCode2(error) {
-  if (isRecord8(error) && typeof error.code === "string") return error.code;
+  if (isRecord9(error) && typeof error.code === "string") return error.code;
   return "UNKNOWN";
 }
 function safeMethod(input2) {
-  return isRecord8(input2) && typeof input2.method === "string" ? input2.method : "invalid";
+  return isRecord9(input2) && typeof input2.method === "string" ? input2.method : "invalid";
 }
 function concatChunks3(chunks, totalBytes) {
   const output = new Uint8Array(totalBytes);
@@ -22962,6 +23104,7 @@ var CODEX_PAGE_LIMIT2 = 100;
 var MAX_CODEX_PAGES2 = 32;
 var CODEX_HISTORY_PAGE_LIMIT = 25;
 var MAX_CODEX_HISTORY_PAGES = 64;
+var CODEX_DIRECTORY_ENTRY_LIMIT = 500;
 var CodexRemoteDomain = class {
   constructor(config, logger, createAppServer = (binary, targetLogger) => new CodexAppServerClient(binary, targetLogger), restartDelaysMs = DEFAULT_RESTART_DELAYS_MS) {
     this.config = config;
@@ -23061,6 +23204,9 @@ var CodexRemoteDomain = class {
       const activeTurnId2 = typeof page.activeTurnId === "string" ? page.activeTurnId : this.turnOwners.get(threadId)?.turnId;
       return activeTurnId2 === void 0 ? page : { ...page, activeTurnId: activeTurnId2 };
     }
+    if (call.method === "dsh/directoryList") {
+      return this.listCodexDirectory(call.params.path);
+    }
     const allowedThread = threadId === void 0 ? void 0 : await this.readKnownThread(threadId);
     if (call.method === "thread/read") {
       return this.callUpstream(call.method, call.params);
@@ -23385,9 +23531,9 @@ var CodexRemoteDomain = class {
         itemsView,
         ...cursor2 === void 0 ? {} : { cursor: cursor2 }
       });
-      const pageResult = isRecord9(result) ? result : {};
+      const pageResult = isRecord10(result) ? result : {};
       for (const rawTurn of array2(pageResult.data)) {
-        if (!isRecord9(rawTurn)) continue;
+        if (!isRecord10(rawTurn)) continue;
         const turnId = typeof rawTurn.id === "string" ? rawTurn.id : void 0;
         const items = rawTurn.itemsView === "full" || turnId === void 0 ? array2(rawTurn.items) : await this.readThreadItems(connectionId, threadId, turnId, array2(rawTurn.items));
         turns.push({ ...rawTurn, items });
@@ -23409,9 +23555,9 @@ var CodexRemoteDomain = class {
           sortDirection: "asc",
           ...cursor2 === void 0 ? {} : { cursor: cursor2 }
         });
-        const pageResult = isRecord9(result) ? result : {};
+        const pageResult = isRecord10(result) ? result : {};
         for (const entry of array2(pageResult.data)) {
-          if (isRecord9(entry) && entry.item !== void 0) items.push(entry.item);
+          if (isRecord10(entry) && entry.item !== void 0) items.push(entry.item);
         }
         cursor2 = typeof pageResult.nextCursor === "string" && pageResult.nextCursor.length > 0 ? pageResult.nextCursor : void 0;
         if (cursor2 === void 0) break;
@@ -23475,7 +23621,7 @@ var CodexRemoteDomain = class {
     return [...this.peers.values()].some((peer) => peer.hasThreadSubscription(threadId));
   }
   resolveUpstreamApproval(params) {
-    if (!isRecord9(params) || typeof params.requestId !== "string" && typeof params.requestId !== "number") return;
+    if (!isRecord10(params) || typeof params.requestId !== "string" && typeof params.requestId !== "number") return;
     for (const [handle, approval] of this.approvals) {
       if (approval.upstreamId === params.requestId) this.approvals.delete(handle);
     }
@@ -23602,6 +23748,68 @@ var CodexRemoteDomain = class {
     }
     throw new RpcError("CODEX_PATH_NOT_ALLOWED", "The CodeX working directory is not available as a Workspace.");
   }
+  async listCodexDirectory(path) {
+    const target = await this.resolveCodexDirectory(path);
+    const rows = await readdir2(target.path, { withFileTypes: true }).catch(() => void 0);
+    if (rows === void 0) {
+      throw new RpcError("CODEX_PATH_NOT_ALLOWED", "The CodeX working directory is not available as a Workspace.");
+    }
+    const entries = [];
+    for (const row of rows) {
+      const child = resolve2(target.path, row.name);
+      let directory = row.isDirectory();
+      if (!directory && row.isSymbolicLink()) {
+        directory = await stat4(child).then((value) => value.isDirectory()).catch(() => false);
+      }
+      if (!directory) continue;
+      try {
+        const canonicalChild = await realpath(child);
+        if (!(await stat4(canonicalChild)).isDirectory()) continue;
+        if (!containsCodexPath(target.canonicalRoot, canonicalChild)) continue;
+      } catch {
+        continue;
+      }
+      entries.push({
+        name: row.name,
+        path: child,
+        hidden: process.platform !== "win32" && row.name.startsWith(".")
+      });
+    }
+    entries.sort((left, right) => left.name.localeCompare(right.name, void 0, { sensitivity: "base" }));
+    return {
+      path: target.path,
+      home: target.root,
+      crumbs: codexDirectoryCrumbs(target.root, target.path),
+      entries: entries.slice(0, CODEX_DIRECTORY_ENTRY_LIMIT),
+      truncated: entries.length > CODEX_DIRECTORY_ENTRY_LIMIT
+    };
+  }
+  async resolveCodexDirectory(path) {
+    if (!isAbsolute3(path)) {
+      throw new RpcError("CODEX_PATH_NOT_ALLOWED", "The CodeX working directory is not available as a Workspace.");
+    }
+    const authority = await this.readWorkspaceAuthority();
+    const lexicalCandidate = resolve2(path);
+    let canonicalCandidate;
+    try {
+      canonicalCandidate = await realpath(path);
+      if (!(await stat4(canonicalCandidate)).isDirectory()) throw new Error("not a directory");
+    } catch {
+      throw new RpcError("CODEX_PATH_NOT_ALLOWED", "The CodeX working directory is not available as a Workspace.");
+    }
+    for (const root of authority.roots) {
+      try {
+        const lexicalRoot = resolve2(root);
+        if (!containsCodexPath(lexicalRoot, lexicalCandidate)) continue;
+        const canonicalRoot = await realpath(root);
+        if (containsCodexPath(canonicalRoot, canonicalCandidate)) {
+          return { path: lexicalCandidate, root: lexicalRoot, canonicalRoot };
+        }
+      } catch {
+      }
+    }
+    throw new RpcError("CODEX_PATH_NOT_ALLOWED", "The CodeX working directory is not available as a Workspace.");
+  }
   async listCodexWorkspacePaths() {
     const paths = /* @__PURE__ */ new Map();
     const authority = await this.readWorkspaceAuthority();
@@ -23618,24 +23826,24 @@ function codexBinaryCandidates(configured, hostPlatform = process.platform, user
   ])];
 }
 function parseCallEnvelope(input2) {
-  if (!isRecord9(input2) || typeof input2.method !== "string" || !("params" in input2) || Object.keys(input2).some((key) => key !== "method" && key !== "params")) {
+  if (!isRecord10(input2) || typeof input2.method !== "string" || !("params" in input2) || Object.keys(input2).some((key) => key !== "method" && key !== "params")) {
     throw new RpcError("INVALID_MESSAGE", "The Codex call envelope is invalid.");
   }
   return { method: input2.method, params: input2.params };
 }
 function parseRespond(input2) {
-  if (!isRecord9(input2) || typeof input2.requestHandle !== "string" || !["accept", "decline", "cancel"].includes(String(input2.decision)) || Object.keys(input2).some((key) => key !== "requestHandle" && key !== "decision")) {
+  if (!isRecord10(input2) || typeof input2.requestHandle !== "string" || !["accept", "decline", "cancel"].includes(String(input2.decision)) || Object.keys(input2).some((key) => key !== "requestHandle" && key !== "decision")) {
     throw new RpcError("INVALID_MESSAGE", "The Codex approval response is invalid.");
   }
   return input2;
 }
 function accountCanRun(result) {
-  if (!isRecord9(result) || typeof result.requiresOpenaiAuth !== "boolean") return false;
-  return result.requiresOpenaiAuth === false || isRecord9(result.account);
+  if (!isRecord10(result) || typeof result.requiresOpenaiAuth !== "boolean") return false;
+  return result.requiresOpenaiAuth === false || isRecord10(result.account);
 }
 function sanitizeAccount(result) {
-  if (!isRecord9(result)) throw new RpcError("CODEX_INVALID_RESPONSE", "Codex App Server returned invalid account state.");
-  const account = isRecord9(result.account) ? result.account : void 0;
+  if (!isRecord10(result)) throw new RpcError("CODEX_INVALID_RESPONSE", "Codex App Server returned invalid account state.");
+  const account = isRecord10(result.account) ? result.account : void 0;
   return {
     authenticated: account !== void 0 || result.requiresOpenaiAuth === false,
     requiresOpenaiAuth: result.requiresOpenaiAuth === true,
@@ -23648,11 +23856,11 @@ function sanitizeAccount(result) {
   };
 }
 function sanitizeThreadList(result) {
-  if (!isRecord9(result) || !Array.isArray(result.data)) {
+  if (!isRecord10(result) || !Array.isArray(result.data)) {
     throw new RpcError("CODEX_INVALID_RESPONSE", "Codex App Server returned an invalid thread list.");
   }
   const data = result.data.flatMap((value) => {
-    if (!isRecord9(value) || typeof value.id !== "string") return [];
+    if (!isRecord10(value) || typeof value.id !== "string") return [];
     return [{
       id: value.id,
       ...typeof value.sessionId === "string" ? { sessionId: value.sessionId } : {},
@@ -23664,7 +23872,7 @@ function sanitizeThreadList(result) {
       ...typeof value.updatedAt === "number" && Number.isFinite(value.updatedAt) ? { updatedAt: value.updatedAt } : {},
       ...typeof value.archived === "boolean" ? { archived: value.archived } : {},
       ...typeof value.isPinned === "boolean" ? { isPinned: value.isPinned } : {},
-      ...isRecord9(value.status) ? { status: value.status } : {}
+      ...isRecord10(value.status) ? { status: value.status } : {}
     }];
   });
   return {
@@ -23674,22 +23882,22 @@ function sanitizeThreadList(result) {
   };
 }
 function filterThreadListByWorkspaceAuthority(result, authority) {
-  if (!isRecord9(result) || !Array.isArray(result.data)) {
+  if (!isRecord10(result) || !Array.isArray(result.data)) {
     throw new RpcError("CODEX_INVALID_RESPONSE", "Codex App Server returned an invalid thread list.");
   }
   return {
     ...result,
-    data: result.data.map((record4) => isRecord9(record4) ? record4 : void 0).filter((thread) => thread !== void 0 && isThreadAllowedByWorkspaceAuthority(thread, authority))
+    data: result.data.map((record5) => isRecord10(record5) ? record5 : void 0).filter((thread) => thread !== void 0 && isThreadAllowedByWorkspaceAuthority(thread, authority))
   };
 }
 function sanitizeProjectList(result) {
-  if (!isRecord9(result) || !Array.isArray(result.data)) {
+  if (!isRecord10(result) || !Array.isArray(result.data)) {
     throw new RpcError("CODEX_INVALID_RESPONSE", "Codex App Server returned an invalid project list.");
   }
   const data = result.data.flatMap((value) => {
-    if (!isRecord9(value) || typeof value.id !== "string" || typeof value.name !== "string") return [];
+    if (!isRecord10(value) || typeof value.id !== "string" || typeof value.name !== "string") return [];
     const roots = Array.isArray(value.roots) ? value.roots.flatMap((root) => {
-      const path = isRecord9(root) && typeof root.path === "string" && root.path.length > 0 ? root.path : void 0;
+      const path = isRecord10(root) && typeof root.path === "string" && root.path.length > 0 ? root.path : void 0;
       return path === void 0 || !isAbsolute3(path) ? [] : [{ path }];
     }) : [];
     if (roots.length === 0) return [];
@@ -23721,20 +23929,31 @@ function containsCodexPath(root, candidate) {
 function normalizeCodexPathForCompare(path) {
   return path.replace(/[\\/]+$/u, "") || path;
 }
+function codexDirectoryCrumbs(root, path) {
+  const crumbs2 = [{ name: basename3(root) || root, path: root, hidden: false }];
+  const remainder = relative(root, path);
+  if (remainder === "") return crumbs2;
+  let current = root;
+  for (const segment of remainder.split(/[\\/]+/u).filter(Boolean)) {
+    current = resolve2(current, segment);
+    crumbs2.push({ name: segment, path: current, hidden: false });
+  }
+  return crumbs2;
+}
 function extractThread(result) {
-  return isRecord9(result) && isRecord9(result.thread) ? result.thread : void 0;
+  return isRecord10(result) && isRecord10(result.thread) ? result.thread : void 0;
 }
 function extractTurnId(result) {
-  if (!isRecord9(result)) return void 0;
+  if (!isRecord10(result)) return void 0;
   if (typeof result.turnId === "string" && result.turnId.length > 0) return result.turnId;
-  if (isRecord9(result.turn) && typeof result.turn.id === "string" && result.turn.id.length > 0) return result.turn.id;
+  if (isRecord10(result.turn) && typeof result.turn.id === "string" && result.turn.id.length > 0) return result.turn.id;
   return void 0;
 }
 function extractThreadId(params) {
-  if (!isRecord9(params)) return void 0;
+  if (!isRecord10(params)) return void 0;
   if (typeof params.threadId === "string") return params.threadId;
-  if (isRecord9(params.thread) && typeof params.thread.id === "string") return params.thread.id;
-  if (isRecord9(params.turn) && typeof params.turn.threadId === "string") return params.turn.threadId;
+  if (isRecord10(params.thread) && typeof params.thread.id === "string") return params.thread.id;
+  if (isRecord10(params.turn) && typeof params.turn.threadId === "string") return params.turn.threadId;
   return void 0;
 }
 function optionalInteger2(value) {
@@ -23776,13 +23995,13 @@ function mapCodexImageInputs(params) {
   return {
     ...params,
     input: params.input.map((value) => {
-      if (!isRecord9(value) || value.type !== "image" || typeof value.mediaType !== "string" || typeof value.data !== "string") return value;
+      if (!isRecord10(value) || value.type !== "image" || typeof value.mediaType !== "string" || typeof value.data !== "string") return value;
       return { type: "image", url: `data:${value.mediaType};base64,${value.data}` };
     })
   };
 }
 function sanitizeApprovalParams(params, requestHandle) {
-  if (!isRecord9(params)) return { requestHandle };
+  if (!isRecord10(params)) return { requestHandle };
   const safe = { ...params };
   delete safe.proposedExecpolicyAmendment;
   delete safe.additionalPermissions;
@@ -23813,7 +24032,7 @@ function isProjectListFallbackError(error) {
 function canTryNextBinary(error) {
   return !(error instanceof RpcError) || !["CODEX_AUTH_REQUIRED", "CODEX_CLOSED"].includes(error.code);
 }
-function isRecord9(value) {
+function isRecord10(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function array2(value) {
@@ -24816,13 +25035,39 @@ function apply(ctx, input2 = {}) {
   const tuiCommandsAvailable = ctx.get("commands", false) !== void 0 && ctx.get("tuiScenes", false) !== void 0;
   const tuiBinding = tuiCommandsAvailable ? {} : void 0;
   if (tuiBinding !== void 0) installTuiRemoteCommand(ctx, () => tuiBinding.target);
-  ctx.inject(["settings", "typertGateway"], (runtimeContext) => {
+  const activateWhenCarrierReady = (runtimeContext) => {
     const gateway = runtimeContext.get("typertGateway");
+    const connection = runtimeContext.get("connection");
+    let disposePendingControl;
+    const installPendingControl = () => {
+      if (connection === void 0 || disposePendingControl !== void 0) return;
+      disposePendingControl = runtimeContext.effect(() => {
+        const control = new PluginControlRuntime(
+          resolveConfig(input2),
+          new IdentityStore().directory,
+          void 0,
+          void 0,
+          void 0
+        );
+        return control.register(connection);
+      }, "dsh-remote pending control");
+    };
+    const startActiveRuntime = async (activeContext) => {
+      await disposePendingControl?.();
+      disposePendingControl = void 0;
+      await activate(activeContext, input2, tuiBinding);
+    };
     if (tuiCommandsAvailable || runtimeContext.get("apiProxy") !== void 0 || new TypertGatewaySwitch(gateway).supportsCarrier()) {
-      return activate(runtimeContext, input2, tuiBinding);
+      return startActiveRuntime(runtimeContext);
     }
-    runtimeContext.inject(["apiProxy"], (legacyContext) => activate(legacyContext, input2));
-  });
+    installPendingControl();
+    runtimeContext.inject(["apiProxy"], (legacyContext) => startActiveRuntime(legacyContext));
+  };
+  if (tuiCommandsAvailable) {
+    ctx.inject(["settings", "typertGateway"], activateWhenCarrierReady);
+  } else {
+    ctx.inject(["settings", "connection", "typertGateway"], activateWhenCarrierReady);
+  }
 }
 async function activate(ctx, input2, tuiBinding) {
   const settings = ctx.get("settings");
@@ -24840,7 +25085,14 @@ async function activate(ctx, input2, tuiBinding) {
   const connection = ctx.get("connection");
   const resolvedConfig = resolveConfig(settingsScope?.get() ?? input2);
   const config = connection === void 0 && resolvedConfig.serverUrl === void 0 ? { ...resolvedConfig, serverUrl: DEFAULT_REMOTE_SERVER_URL } : resolvedConfig;
-  if (!config.enabled) return;
+  const defaultIdentityDirectory = new IdentityStore().directory;
+  if (!config.enabled) {
+    if (connection !== void 0) {
+      const controlRuntime2 = new PluginControlRuntime(config, defaultIdentityDirectory, settingsScope, void 0, void 0);
+      ctx.effect(() => controlRuntime2.register(connection), "dsh-remote disabled control");
+    }
+    return;
+  }
   const logger = new SafeLogger({
     debug: (message) => {
       ctx.logger.debug(message);
@@ -24859,7 +25111,6 @@ async function activate(ctx, input2, tuiBinding) {
       console.error(message);
     }
   }, config.logLevel);
-  const defaultIdentityDirectory = new IdentityStore().directory;
   const hostIdentities = new IdentityStore({
     directory: config.serverUrl === void 0 ? defaultIdentityDirectory : serverStorageDirectory(defaultIdentityDirectory, config.serverUrl, "host")
   });