@codexhost/cli-darwin-x64 0.11.0 → 0.12.0

package/app/plugins/claude-code/plugin.mjs

@@ -14610,6 +14610,7 @@ var CONSOLE_HOST_METHODS = Object.freeze([
   "codexhost/harness/display-settings/get",
   "codexhost/harness/display-settings/set",
   "codexhost/harness/inspect",
+  "codexhost/harness/installation",
   "codexhost/harness/launch-settings/get",
   "codexhost/harness/launch-settings/set",
   "codexhost/harness/web-ui/open",
@@ -15256,14 +15257,17 @@ var harnessLaunchSettingsSchema = external_exports.object({
 // ../../shared-contracts/dist/harness-installation.js
 var harnessInstallationParamsSchema = external_exports.object({
   harnessId: harnessIdSchema,
-  action: external_exports.enum(["check", "update"])
+  action: external_exports.enum(["check", "update", "install"])
 }).strict();
 var harnessInstallationStateSchema = external_exports.object({
   currentVersion: external_exports.string().min(1).max(128),
   latestVersion: external_exports.string().min(1).max(128),
   updateAvailable: external_exports.boolean(),
   canUpdate: external_exports.boolean(),
-  message: external_exports.string().max(2048).optional()
+  // Adapter-owned diagnostic text; UI uses messageCode rather than displaying it verbatim.
+  message: external_exports.string().max(2048).optional(),
+  messageCode: external_exports.string().min(1).max(128).optional(),
+  latestVersionKind: external_exports.enum(["unknown", "tracking-branch"]).optional()
 }).strict();
 
 // ../../shared-contracts/dist/codex-accounts.js
@@ -15565,6 +15569,38 @@ var updateStatusResultSchema = external_exports.strictObject({
   status: updateStatusSchema.nullable()
 });
 
+// ../../shared-contracts/dist/remote-runtime.js
+var remoteUpdatePhaseSchema = external_exports.enum([
+  "idle",
+  "installing",
+  "restarting",
+  "succeeded",
+  "failed"
+]);
+var runtimeStatusSchema = external_exports.object({
+  runningVersion: external_exports.string().nullable(),
+  installedVersion: external_exports.string().nullable(),
+  restartRequired: external_exports.boolean(),
+  remote: external_exports.boolean(),
+  updateSupported: external_exports.boolean(),
+  update: external_exports.object({
+    phase: remoteUpdatePhaseSchema,
+    targetVersion: external_exports.string().nullable(),
+    error: external_exports.string().nullable()
+  })
+});
+var remoteUpdateParamsSchema = external_exports.object({
+  version: external_exports.string().regex(/^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?$/u)
+}).strict();
+var remoteSshSetupParamsSchema = external_exports.object({
+  hostname: external_exports.string().min(1).max(1024).refine((value) => !value.startsWith("-") && !/\s/u.test(value)),
+  port: external_exports.number().int().min(1).max(65535).nullable(),
+  identity: external_exports.string().max(4096).nullable(),
+  action: external_exports.enum(["inspect", "install", "update", "repair"]),
+  version: external_exports.string().regex(/^\d+\.\d+\.\d+$/u).nullable()
+}).strict();
+var remoteSshSetupResultSchema = external_exports.object({ state: external_exports.enum(["installed", "not-installed"]) }).strict();
+
 // ../../shared-contracts/dist/index.js
 var workspaceContractVersionSchema = external_exports.literal(WORKSPACE_CONTRACT_VERSION);
 
@@ -42487,32 +42523,109 @@ import { opendir, realpath, stat } from "node:fs/promises";
 import os2 from "node:os";
 import path2 from "node:path";
 import { createInterface } from "node:readline";
-var CLAUDE_SESSION_IMPORT_TITLE_MAX_LENGTH = 120;
-var CLAUDE_INTERNAL_USER_TEXT = /^<(?:local-command-|command-)/u;
-var ClaudeSessionChangedError = class extends Error {
-  constructor() {
-    super("Claude Code Session changed during discovery; refresh and retry");
+
+// ../../harness-adapter/dist/session-import.js
+var SessionImportChangedError = class extends Error {
+  constructor(message = "Native Session changed during discovery; refresh and retry") {
+    super(message);
+    this.name = "SessionImportChangedError";
   }
 };
-function isRecord2(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-function missing(error52) {
-  return isRecord2(error52) && error52.code === "ENOENT";
+function isMissingFileError(error52) {
+  return typeof error52 === "object" && error52 !== null && "code" in error52 && error52.code === "ENOENT";
 }
-function sameFile(left, right) {
-  return left.size === right.size && left.mtimeMs === right.mtimeMs && left.ctimeMs === right.ctimeMs && left.ino === right.ino && left.dev === right.dev;
+function sameFileFingerprint(left, right) {
+  return left === null || right === null ? left === right : left.dev === right.dev && left.ino === right.ino && left.size === right.size && left.mtimeMs === right.mtimeMs && left.ctimeMs === right.ctimeMs;
 }
-function cleanText(value) {
+function sessionImportTitle(value, maxLength = HARNESS_SESSION_IMPORT_TITLE_MAX_LENGTH) {
   if (typeof value !== "string")
     return null;
   const normalized = value.replaceAll("\0", "").replaceAll(/\s+/gu, " ").trim();
   if (!normalized)
     return null;
+  if (normalized.length <= maxLength)
+    return normalized;
   const characters = [...normalized];
-  if (characters.length <= CLAUDE_SESSION_IMPORT_TITLE_MAX_LENGTH)
+  if (characters.length <= maxLength)
     return normalized;
-  return `${characters.slice(0, CLAUDE_SESSION_IMPORT_TITLE_MAX_LENGTH - 1).join("").trimEnd()}…`;
+  return `${characters.slice(0, maxLength - 1).join("").trimEnd()}…`;
+}
+function sessionImportCandidate(input) {
+  const time3 = typeof input.updatedAt === "number" ? input.updatedAt : typeof input.updatedAt === "string" ? Date.parse(input.updatedAt) : Number.NaN;
+  const parsed = harnessSessionImportCandidateSchema.safeParse({
+    nativeSessionId: input.nativeSessionId,
+    cwd: input.cwd,
+    title: typeof input.title === "string" && input.title.trim().length > 0 ? input.title : null,
+    updatedAt: Math.floor(time3),
+    // Unknown must stay unknown; only an explicit boolean is a native statement.
+    running: typeof input.running === "boolean" ? input.running : null
+  });
+  return parsed.success ? parsed.data : null;
+}
+var SessionImportScope = class {
+  #abort = new AbortController();
+  #options;
+  #pending = /* @__PURE__ */ new Set();
+  constructor(options) {
+    this.#options = options;
+  }
+  #closed() {
+    return {
+      ok: false,
+      error: { code: "invalidState", message: this.#options.closedMessage, retryable: false }
+    };
+  }
+  read(operation) {
+    const signal = this.#abort.signal;
+    if (signal.aborted)
+      return Promise.resolve(this.#closed());
+    let started;
+    try {
+      started = operation(signal);
+    } catch (error52) {
+      started = Promise.reject(error52 instanceof Error ? error52 : new Error("Session read failed"));
+    }
+    const request = started.then((value) => signal.aborted ? this.#closed() : { ok: true, value }).catch(() => signal.aborted ? this.#closed() : {
+      ok: false,
+      error: {
+        code: "unavailable",
+        message: this.#options.unavailableMessage,
+        retryable: true
+      }
+    }).finally(() => this.#pending.delete(request));
+    this.#pending.add(request);
+    return request;
+  }
+  /** `read` for `resolveCandidate`: a null source is the selected Session having disappeared. */
+  async resolve(operation) {
+    const result = await this.read(operation);
+    if (!result.ok)
+      return result;
+    return result.value ? { ok: true, value: result.value } : {
+      ok: false,
+      error: {
+        code: "sessionNotFound",
+        message: this.#options.notFoundMessage,
+        retryable: false
+      }
+    };
+  }
+  /** Idempotent. Resolves after every started read has settled. */
+  async close() {
+    this.#abort.abort();
+    await Promise.allSettled(this.#pending);
+  }
+};
+
+// dist/claude-session-import.js
+var CLAUDE_SESSION_IMPORT_TITLE_MAX_LENGTH = 120;
+var CLAUDE_INTERNAL_USER_TEXT = /^<(?:local-command-|command-)/u;
+var CLAUDE_SESSION_CHANGED = "Claude Code Session changed during discovery; refresh and retry";
+function isRecord2(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function cleanText(value) {
+  return sessionImportTitle(value, CLAUDE_SESSION_IMPORT_TITLE_MAX_LENGTH);
 }
 function userText(message) {
   if (!isRecord2(message) || message.role !== "user")
@@ -42528,7 +42641,7 @@ function claudeProjectsDirectory(environment) {
 async function sessionFiles(directory, signal) {
   signal.throwIfAborted();
   const projects = await opendir(directory).catch((error52) => {
-    if (missing(error52))
+    if (isMissingFileError(error52))
       return null;
     throw error52;
   });
@@ -42540,7 +42653,7 @@ async function sessionFiles(directory, signal) {
     if (!project.isDirectory())
       continue;
     const entries = await opendir(path2.join(directory, project.name)).catch((error52) => {
-      if (missing(error52))
+      if (isMissingFileError(error52))
         return null;
       throw error52;
     });
@@ -42607,24 +42720,23 @@ async function readCandidate(file2, signal) {
   if (!hasConversation || !cwd)
     return null;
   const after = await stat(file2);
-  if (!sameFile(before, after))
-    throw new ClaudeSessionChangedError();
+  if (!sameFileFingerprint(before, after))
+    throw new SessionImportChangedError(CLAUDE_SESSION_CHANGED);
   const resolvedCwd = await realpath(cwd);
   if (!(await stat(resolvedCwd)).isDirectory())
     return null;
-  const candidate = harnessSessionImportCandidateSchema.safeParse({
+  const candidate = sessionImportCandidate({
     nativeSessionId,
     title: customTitle ?? generatedTitle ?? firstPrompt,
-    updatedAt: Math.floor(before.mtimeMs),
-    cwd: resolvedCwd,
-    running: null
+    updatedAt: before.mtimeMs,
+    cwd: resolvedCwd
   });
   const nativeRef = nativeSessionRefSchema.safeParse({
     harnessId: "claude-code",
     nativeSessionId,
     formatVersion: 1
   });
-  return candidate.success && nativeRef.success ? { candidate: candidate.data, nativeRef: nativeRef.data } : null;
+  return candidate && nativeRef.success ? { candidate, nativeRef: nativeRef.data } : null;
 }
 var ClaudeSessionImportIndex = class {
   #directory;
@@ -42648,7 +42760,7 @@ var ClaudeSessionImportIndex = class {
       try {
         const fingerprint = await stat(file2);
         const cached2 = this.#cache.get(file2);
-        const source = cached2 && sameFile(cached2.fingerprint, fingerprint) ? cached2.source : await readCandidate(file2, signal);
+        const source = cached2 && sameFileFingerprint(cached2.fingerprint, fingerprint) ? cached2.source : await readCandidate(file2, signal);
         if (!source)
           continue;
         if (!(await stat(source.candidate.cwd)).isDirectory())
@@ -42660,7 +42772,7 @@ var ClaudeSessionImportIndex = class {
         next.set(file2, { fingerprint, source });
         sources.push(source);
       } catch (error52) {
-        if (!missing(error52) && !(error52 instanceof ClaudeSessionChangedError))
+        if (!isMissingFileError(error52) && !(error52 instanceof SessionImportChangedError))
           throw error52;
       }
     }
@@ -42685,7 +42797,7 @@ var ClaudeSessionImportIndex = class {
       const source = await readCandidate(selected, signal);
       return source?.candidate.nativeSessionId === nativeSessionId ? source : null;
     } catch (error52) {
-      if (missing(error52))
+      if (isMissingFileError(error52))
         return null;
       throw error52;
     }
@@ -43123,6 +43235,60 @@ async function npmInstallation(command, packages, environment) {
   return null;
 }
 
+// ../../harness-discovery/dist/installer.js
+import { mkdtemp, rm as rm2, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join as join2 } from "node:path";
+function createHarnessInstaller(environment, source) {
+  return async () => {
+    if (!["darwin", "linux", "win32"].includes(process.platform))
+      throw new Error("Unsupported installation platform");
+    const env = withNodeRuntimeOnPath(environment);
+    if ("npm" in source) {
+      const npm = resolveHarnessExecutable({
+        id: "npm",
+        command: "npm",
+        installRoots: {
+          posix: [
+            "~/.npm-global/bin",
+            "~/.local/bin",
+            VERSION_MANAGER_ROOTS,
+            "/opt/homebrew/bin",
+            "/usr/local/bin",
+            "/usr/bin"
+          ],
+          windows: [
+            "${APPDATA}/npm",
+            VERSION_MANAGER_ROOTS,
+            "${ProgramFiles}/nodejs",
+            "${LOCALAPPDATA}/Programs/nodejs"
+          ]
+        }
+      }, { environment: env });
+      if (!npm)
+        throw new Error("Install Node.js and npm first");
+      await runInstallationCommand(npm.executable, ["install", "--global", source.npm], {
+        ...env,
+        ...source.allowScripts ? { npm_config_allow_scripts: source.allowScripts } : {}
+      }, 6e5);
+      return;
+    }
+    const windows = process.platform === "win32";
+    const url2 = windows ? source.windows : source.posix;
+    if (new URL(url2).protocol !== "https:")
+      throw new Error("Installer requires HTTPS");
+    const script = await fetchInstallationText(url2);
+    const directory = await mkdtemp(join2(tmpdir(), "codexhost-installer-"));
+    try {
+      const file2 = join2(directory, windows ? "install.ps1" : "install.sh");
+      await writeFile(file2, script, { mode: 384 });
+      await runInstallationCommand(windows ? "powershell.exe" : source.shell ?? "bash", windows ? ["-NoProfile", "-NonInteractive", "-ExecutionPolicy", "Bypass", "-File", file2] : [file2], env, 6e5);
+    } finally {
+      await rm2(directory, { recursive: true, force: true });
+    }
+  };
+}
+
 // dist/command.js
 var ClaudeCodeExecutableError = class extends Error {
   code = "CLAUDE_NOT_FOUND";
@@ -43174,7 +43340,7 @@ function resolveClaudeCodeExecutable(input = {}, dependencies = {}) {
 
 // dist/pending-session.js
 import { randomUUID as randomUUID2 } from "node:crypto";
-import { mkdir, open, readFile as readFile3, rename, rm as rm2, stat as stat2, unlink } from "node:fs/promises";
+import { mkdir, open, readFile as readFile3, rename, rm as rm3, stat as stat2, unlink } from "node:fs/promises";
 import os4 from "node:os";
 import path8 from "node:path";
 var reservationSchema = external_exports.strictObject({
@@ -43222,7 +43388,7 @@ var ClaudePendingSessions = class {
         await file2.close();
       }
     } catch (error52) {
-      await rm2(directory, { recursive: true, force: true });
+      await rm3(directory, { recursive: true, force: true });
       throw error52;
     }
     await this.#sync(directory);
@@ -43267,7 +43433,7 @@ var ClaudePendingSessions = class {
       await rename(temporary, path8.join(directory, "session.json"));
       await this.#sync(directory);
     } finally {
-      await rm2(temporary, { force: true });
+      await rm3(temporary, { force: true });
     }
   }
   async #sync(directory) {
@@ -43296,7 +43462,7 @@ var ClaudePendingSessions = class {
     await this.#sync(this.#path(ref, cwd));
   }
   async discard(ref, cwd) {
-    await rm2(this.#path(ref, cwd), { recursive: true, force: true });
+    await rm3(this.#path(ref, cwd), { recursive: true, force: true });
   }
 };
 
@@ -48749,22 +48915,10 @@ var ClaudeCodeAdapter = class {
   harnessId = claudeCodeHarnessId2;
   sessionImport = Object.freeze({
     listCandidates: async () => {
-      const result = await this.#readImport((signal) => this.#importIndex.list(signal));
+      const result = await this.#importScope.read((signal) => this.#importIndex.list(signal));
       return result.ok ? { ok: true, value: result.value.map(({ candidate }) => candidate) } : result;
     },
-    resolveCandidate: async (nativeSessionId) => {
-      const result = await this.#readImport((signal) => this.#importIndex.resolve(nativeSessionId, signal));
-      if (!result.ok)
-        return result;
-      return result.value ? { ok: true, value: result.value } : {
-        ok: false,
-        error: {
-          code: "sessionNotFound",
-          message: "Claude Code Session is no longer importable",
-          retryable: false
-        }
-      };
-    }
+    resolveCandidate: (nativeSessionId) => this.#importScope.resolve((signal) => this.#importIndex.resolve(nativeSessionId, signal))
   });
   subagents = {
     readSnapshot: async (input) => {
@@ -48809,9 +48963,12 @@ var ClaudeCodeAdapter = class {
   #cancelTimeoutMs;
   #closeTimeoutMs;
   #dependencies;
-  #importAbort = new AbortController();
   #importIndex;
-  #importRequests = /* @__PURE__ */ new Set();
+  #importScope = new SessionImportScope({
+    closedMessage: "Claude Code Adapter is closed",
+    unavailableMessage: "Claude Code Session discovery failed; check storage access and duplicate Session identities, then retry after closing native clients",
+    notFoundMessage: "Claude Code Session is no longer importable"
+  });
   #pendingSessions;
   #toolOutputLimit;
   #continuationQuiescenceMs;
@@ -48880,24 +49037,6 @@ var ClaudeCodeAdapter = class {
       readSubagentMessages: ({ cwd, sessionId, nativeSubagentId: nativeSubagentId2 }) => jkt(sessionId, nativeSubagentId2, { dir: cwd })
     };
   }
-  #readImport(operation) {
-    if (this.#importAbort.signal.aborted) {
-      return Promise.resolve({
-        ok: false,
-        error: invalidState("Claude Code Adapter is closed")
-      });
-    }
-    const request = operation(this.#importAbort.signal).then((value) => ({ ok: true, value })).catch(() => ({
-      ok: false,
-      error: {
-        code: "unavailable",
-        message: "Claude Code Session discovery failed; check storage access and duplicate Session identities, then retry after closing native clients",
-        retryable: true
-      }
-    })).finally(() => this.#importRequests.delete(request));
-    this.#importRequests.add(request);
-    return request;
-  }
   async inspect(input = {}) {
     if (this.#closePromise) {
       return {
@@ -49213,10 +49352,9 @@ var ClaudeCodeAdapter = class {
   }
   close() {
     if (!this.#closePromise) {
-      this.#importAbort.abort();
       this.#inspectionCache.clear();
       this.#closePromise = Promise.all([
-        ...this.#importRequests,
+        this.#importScope.close(),
         ...[...this.#inspectors].map((inspector) => inspector.close()),
         ...[...this.#sessions].map((session) => session.close()),
         ...this.#inspectionInFlight.values()
@@ -49281,6 +49419,7 @@ function createClaudeInstallation(environment, command) {
         updateAvailable: newerInstallationVersion(currentVersion, latestVersion),
         canUpdate,
         ...!canUpdate ? {
+          messageCode: blocked ? "claude-policy-restricted" : "original-installer",
           message: blocked ? "Claude updates are restricted by the installation's settings or policy." : "Use the original installer or package manager for this Claude installation."
         } : {}
       };
@@ -49382,7 +49521,13 @@ async function createHarnessAdapter(context) {
   return Object.assign(new ClaudeCodeAdapter({
     ...environment[CLAUDE_CODE_COMMAND_ENV] ? { command: environment[CLAUDE_CODE_COMMAND_ENV] } : {},
     environment
-  }), { installation: createClaudeInstallation(environment, environment[CLAUDE_CODE_COMMAND_ENV]) });
+  }), {
+    installation: createClaudeInstallation(environment, environment[CLAUDE_CODE_COMMAND_ENV]),
+    install: createHarnessInstaller(environment, {
+      posix: "https://claude.ai/install.sh",
+      windows: "https://claude.ai/install.ps1"
+    })
+  });
 }
 async function warmup(adapter) {
   try {