@codexhost/cli-darwin-x64 0.14.0 → 0.16.0

package/app/plugins/workbuddy/plugin.mjs

@@ -3040,10 +3040,10 @@ var $ZodObject = /* @__PURE__ */ $constructor("$ZodObject", (inst, def) => {
     const shape = def.shape;
     const propValues = {};
     for (const key in shape) {
-      const field = shape[key]._zod;
-      if (field.values) {
+      const field2 = shape[key]._zod;
+      if (field2.values) {
         propValues[key] ?? (propValues[key] = /* @__PURE__ */ new Set());
-        for (const v of field.values)
+        for (const v of field2.values)
           propValues[key].add(v);
       }
     }
@@ -14683,6 +14683,8 @@ var usageStatisticsTotalsSchema = external_exports.strictObject({
   cachedInputTokens: count,
   cacheWriteInputTokens: count,
   cacheKnownInputTokens: count,
+  cacheHitCachedInputTokens: count,
+  cacheHitInputTokens: count,
   outputTokens: count,
   reasoningOutputTokens: count,
   /** USD at the public price, summed over the priced requests only. */
@@ -14790,6 +14792,51 @@ var hostInteractionIdSchema = opaqueIdSchema.brand();
 var threadPrewarmDiscardParamsSchema = external_exports.object({ threadId: hostThreadIdSchema });
 var threadPrewarmDiscardResultSchema = external_exports.object({ discarded: external_exports.boolean() });
 
+// ../../shared-contracts/dist/thread-questions.js
+var field = external_exports.discriminatedUnion("type", [
+  external_exports.object({
+    id: external_exports.string().min(1),
+    type: external_exports.literal("choice"),
+    prompt: external_exports.string(),
+    options: external_exports.array(external_exports.object({
+      value: external_exports.string().min(1),
+      label: external_exports.string(),
+      description: external_exports.string().optional()
+    })).min(1),
+    multiple: external_exports.boolean(),
+    allowOther: external_exports.boolean(),
+    optional: external_exports.boolean()
+  }),
+  external_exports.object({
+    id: external_exports.string().min(1),
+    type: external_exports.literal("text"),
+    prompt: external_exports.string(),
+    multiline: external_exports.boolean(),
+    secret: external_exports.literal(false),
+    optional: external_exports.boolean(),
+    placeholder: external_exports.string().optional(),
+    prefill: external_exports.string().optional()
+  })
+]);
+var threadQuestionSchema = external_exports.object({
+  interactionId: external_exports.string().min(1),
+  turnId: external_exports.string().min(1),
+  title: external_exports.string().optional(),
+  questions: external_exports.array(field).min(1)
+}).refine(({ questions }) => questions.some((q) => q.type === "choice" && q.multiple), {
+  message: "Shared cards require at least one multi-select question"
+});
+var threadQuestionsListParamsSchema = external_exports.strictObject({ threadId: external_exports.string().min(1) });
+var threadQuestionsResultSchema = external_exports.object({ questions: external_exports.array(threadQuestionSchema) });
+var threadQuestionRespondParamsSchema = external_exports.strictObject({
+  threadId: external_exports.string().min(1),
+  turnId: external_exports.string().min(1),
+  interactionId: external_exports.string().min(1),
+  answers: external_exports.record(external_exports.string(), external_exports.array(external_exports.string())),
+  cancelled: external_exports.boolean().default(false)
+});
+var threadQuestionRespondResultSchema = external_exports.object({ accepted: external_exports.literal(true) });
+
 // ../../shared-contracts/dist/console.js
 var consoleAnnouncementSchema = external_exports.strictObject({
   title: external_exports.string().trim().min(1).max(200),
@@ -16140,26 +16187,26 @@ function parseHostUsage(value) {
     }
   }
   const indicators = value.composerIndicators === void 0 ? {} : { composerIndicators: composerIndicatorsSchema.parse(value.composerIndicators) };
-  for (const field of [
+  for (const field2 of [
     "totalCredits",
     "contextUsagePercent",
     "apiOutputTokensPerSecond"
   ]) {
-    const candidate = value[field];
+    const candidate = value[field2];
     if (candidate !== void 0 && (typeof candidate !== "number" || !Number.isFinite(candidate) || candidate < 0)) {
-      throw new Error(`Harness Usage '${field}' must be a finite non-negative number`);
+      throw new Error(`Harness Usage '${field2}' must be a finite non-negative number`);
     }
   }
-  for (const field of tokenFields) {
-    const candidate = value[field];
+  for (const field2 of tokenFields) {
+    const candidate = value[field2];
     if (candidate !== void 0 && (typeof candidate !== "number" || !Number.isSafeInteger(candidate) || candidate < 0)) {
-      throw new Error(`Harness Usage '${field}' must be a non-negative safe integer`);
+      throw new Error(`Harness Usage '${field2}' must be a non-negative safe integer`);
     }
   }
-  for (const field of safeIntegerFields) {
-    const candidate = value[field];
+  for (const field2 of safeIntegerFields) {
+    const candidate = value[field2];
     if (candidate !== void 0 && (typeof candidate !== "number" || !Number.isSafeInteger(candidate) || candidate < 0)) {
-      throw new Error(`Harness Usage '${field}' must be a non-negative safe integer`);
+      throw new Error(`Harness Usage '${field2}' must be a non-negative safe integer`);
     }
   }
   if (value.outputTokensPerSecond !== void 0 && (typeof value.outputTokensPerSecond !== "number" || !Number.isFinite(value.outputTokensPerSecond) || value.outputTokensPerSecond < 0)) {
@@ -16168,10 +16215,10 @@ function parseHostUsage(value) {
   if (value.totalCostUsd !== void 0 && (typeof value.totalCostUsd !== "number" || !Number.isFinite(value.totalCostUsd) || value.totalCostUsd < 0)) {
     throw new Error("Harness Usage 'totalCostUsd' must be a finite non-negative number");
   }
-  for (const field of percentFields) {
-    const candidate = value[field];
+  for (const field2 of percentFields) {
+    const candidate = value[field2];
     if (candidate !== void 0 && (typeof candidate !== "number" || !Number.isFinite(candidate) || candidate < 0 || candidate > 100)) {
-      throw new Error(`Harness Usage '${field}' must be between 0 and 100`);
+      throw new Error(`Harness Usage '${field2}' must be between 0 and 100`);
     }
   }
   if (value.sessionCacheUsage !== void 0) {
@@ -16242,19 +16289,19 @@ function parseHostUsageRequest(value) {
   if (typeof value.requestId !== "string" || value.requestId.length === 0) {
     throw new Error("Harness Usage request 'requestId' must be a non-empty string");
   }
-  for (const field of ["model", "provider"]) {
-    const candidate = value[field];
+  for (const field2 of ["model", "provider"]) {
+    const candidate = value[field2];
     if (candidate !== void 0 && (typeof candidate !== "string" || candidate.length === 0)) {
-      throw new Error(`Harness Usage request '${field}' must be a non-empty string`);
+      throw new Error(`Harness Usage request '${field2}' must be a non-empty string`);
     }
   }
   if (value.historical !== void 0 && typeof value.historical !== "boolean") {
     throw new Error("Harness Usage request 'historical' must be a boolean");
   }
-  for (const field of requestTokenFields) {
-    const candidate = value[field];
+  for (const field2 of requestTokenFields) {
+    const candidate = value[field2];
     if (candidate !== void 0 && (typeof candidate !== "number" || !Number.isSafeInteger(candidate) || candidate < 0)) {
-      throw new Error(`Harness Usage request '${field}' must be a non-negative safe integer`);
+      throw new Error(`Harness Usage request '${field2}' must be a non-negative safe integer`);
     }
   }
   if (value.inputTokens === void 0 || value.outputTokens === void 0) {
@@ -16360,6 +16407,7 @@ var HARNESS_BROKER_PROTOCOL_VERSION = 1;
 var HARNESS_BROKER_MAX_FRAME_BYTES = 8 * 1024 * 1024;
 var HARNESS_BROKER_MAX_PENDING_REQUESTS = 32;
 var HARNESS_BROKER_REQUEST_TIMEOUT_MS = 15e3;
+var HARNESS_BROKER_SESSION_IMPORT_PAGE_SIZE = 100;
 var HARNESS_BROKER_IDLE_TIMEOUT_MS = 60 * 60 * 1e3;
 var HARNESS_BROKER_RETIRING_ERROR_CODE = "brokerRetiring";
 var harnessBrokerMethodSchema = external_exports.enum([
@@ -16367,6 +16415,8 @@ var harnessBrokerMethodSchema = external_exports.enum([
   "adapter.inspectAccount",
   "adapter.credits",
   "adapter.open",
+  "adapter.sessionImport.list",
+  "adapter.sessionImport.resolve",
   "adapter.subagent.readSnapshot",
   "session.readSnapshot",
   "session.readCapabilities",
@@ -16469,30 +16519,6 @@ function consumeBrokerFrames(socket, onFrame, onError) {
   });
 }
 
-// ../../harness-broker/dist/paths.js
-import os from "node:os";
-import path from "node:path";
-var HARNESS_BROKER_DESCRIPTOR_ENV = "CODEXHOST_CLAUDE_BROKER_DESCRIPTOR";
-var HARNESS_BROKER_DESCRIPTOR_FILE = "claude-code-broker-v1.json";
-function defaultHarnessBrokerDirectory(environment = process.env) {
-  const home = environment.HOME || os.homedir();
-  return path.join(home, ".codexhost", "harness-broker");
-}
-function defaultHarnessBrokerDescriptorPath(environment = process.env, harnessId = "claude-code") {
-  harnessPluginIdSchema.parse(harnessId);
-  if (harnessId !== "claude-code")
-    return path.join(defaultHarnessBrokerDirectory(environment), `${harnessId}-broker-v1.json`);
-  return environment[HARNESS_BROKER_DESCRIPTOR_ENV] ?? path.join(defaultHarnessBrokerDirectory(environment), HARNESS_BROKER_DESCRIPTOR_FILE);
-}
-function harnessBrokerLaunchAgentLabel(harnessId = "claude-code") {
-  harnessPluginIdSchema.parse(harnessId);
-  return harnessId === "claude-code" ? "ai.bytepioneer.codexhost.native-harness-broker" : `ai.bytepioneer.codexhost.${harnessId}-broker`;
-}
-function harnessBrokerLaunchAgentPlistPath(environment = process.env, harnessId = "claude-code") {
-  const home = environment.HOME || os.homedir();
-  return path.join(home, "Library", "LaunchAgents", `${harnessBrokerLaunchAgentLabel(harnessId)}.plist`);
-}
-
 // ../../harness-broker/dist/validation.js
 var cwdSchema = external_exports.string().min(1).max(16384);
 var brokerEnvironmentSchema = external_exports.object({
@@ -16543,7 +16569,31 @@ var brokerOpenInputSchema = external_exports.discriminatedUnion("kind", [
   forkSchema,
   rollbackSchema
 ]);
-var brokerInspectInputSchema = external_exports.object({ cwd: cwdSchema.optional(), refresh: external_exports.boolean().optional() }).strict();
+var brokerInspectInputSchema = external_exports.object({
+  cwd: cwdSchema.optional(),
+  refresh: external_exports.boolean().optional(),
+  purpose: external_exports.literal("availability").optional()
+}).strict();
+var brokerSessionImportListParamsSchema = external_exports.object({
+  offset: external_exports.number().int().nonnegative().safe(),
+  limit: external_exports.number().int().min(1).max(HARNESS_BROKER_SESSION_IMPORT_PAGE_SIZE)
+}).strict();
+var brokerSessionImportResolveParamsSchema = external_exports.object({ nativeSessionId: harnessSessionImportIdSchema }).strict();
+var brokerSessionImportPageSchema = external_exports.object({
+  candidates: external_exports.array(harnessSessionImportCandidateSchema).max(HARNESS_BROKER_SESSION_IMPORT_PAGE_SIZE),
+  total: external_exports.number().int().nonnegative().safe()
+}).strict();
+var brokerSessionImportSourceSchema = external_exports.object({
+  candidate: harnessSessionImportCandidateSchema,
+  nativeRef: nativeSessionRefSchema
+}).strict().superRefine((source, context) => {
+  if (source.nativeRef.nativeSessionId !== source.candidate.nativeSessionId) {
+    context.addIssue({
+      code: "custom",
+      message: "Session import source identity does not match"
+    });
+  }
+});
 var textInputSchema = external_exports.object({ type: external_exports.literal("text"), text: external_exports.string().max(4e6) }).strict();
 var turnStartSchema = external_exports.object({
   type: external_exports.literal("turn.start"),
@@ -16714,6 +16764,107 @@ var harnessOutputSchema = external_exports.custom((value) => {
   return false;
 });
 
+// ../../harness-broker/dist/session-import-client.js
+function createBrokerSessionImportCapability(input) {
+  let listing = null;
+  const closed = () => ({
+    ok: false,
+    error: { code: "invalidState", message: "Harness broker adapter is closed", retryable: false }
+  });
+  const invalid = () => ({
+    ok: false,
+    error: {
+      code: "protocolError",
+      message: "Harness broker returned invalid Session import metadata",
+      retryable: false
+    }
+  });
+  const list = async () => {
+    try {
+      const candidates = [];
+      const identities = /* @__PURE__ */ new Set();
+      let total;
+      for (; ; ) {
+        if (input.isClosed())
+          return closed();
+        const result = await input.request("adapter.sessionImport.list", {
+          offset: candidates.length,
+          limit: HARNESS_BROKER_SESSION_IMPORT_PAGE_SIZE
+        });
+        if (input.isClosed())
+          return closed();
+        if (!result.ok)
+          return result;
+        const page = brokerSessionImportPageSchema.safeParse(result.value);
+        if (!page.success || total !== void 0 && total !== page.data.total || page.data.total < candidates.length + page.data.candidates.length || page.data.candidates.length === 0 && candidates.length < page.data.total)
+          return invalid();
+        total = page.data.total;
+        for (const candidate of page.data.candidates) {
+          if (identities.has(candidate.nativeSessionId))
+            return invalid();
+          identities.add(candidate.nativeSessionId);
+          candidates.push(candidate);
+        }
+        if (candidates.length === total)
+          return { ok: true, value: candidates };
+      }
+    } catch (error51) {
+      return { ok: false, error: input.error(error51) };
+    }
+  };
+  return {
+    listCandidates() {
+      if (input.isClosed())
+        return Promise.resolve(closed());
+      listing ??= list().finally(() => {
+        listing = null;
+      });
+      return listing;
+    },
+    async resolveCandidate(nativeSessionId) {
+      if (input.isClosed())
+        return closed();
+      try {
+        const result = await input.request("adapter.sessionImport.resolve", { nativeSessionId });
+        if (input.isClosed())
+          return closed();
+        if (!result.ok)
+          return result;
+        const source = brokerSessionImportSourceSchema.safeParse(result.value);
+        if (!source.success || source.data.nativeRef.harnessId !== input.harnessId || source.data.candidate.nativeSessionId !== nativeSessionId)
+          return invalid();
+        return { ok: true, value: source.data };
+      } catch (error51) {
+        return { ok: false, error: input.error(error51) };
+      }
+    }
+  };
+}
+
+// ../../harness-broker/dist/paths.js
+import os from "node:os";
+import path from "node:path";
+var HARNESS_BROKER_DESCRIPTOR_ENV = "CODEXHOST_CLAUDE_BROKER_DESCRIPTOR";
+var HARNESS_BROKER_DESCRIPTOR_FILE = "claude-code-broker-v1.json";
+function defaultHarnessBrokerDirectory(environment = process.env) {
+  const home = environment.HOME || os.homedir();
+  return path.join(home, ".codexhost", "harness-broker");
+}
+function defaultHarnessBrokerDescriptorPath(environment = process.env, harnessId = "claude-code") {
+  harnessPluginIdSchema.parse(harnessId);
+  if (harnessId !== "claude-code")
+    return path.join(defaultHarnessBrokerDirectory(environment), `${harnessId}-broker-v1.json`);
+  return environment[HARNESS_BROKER_DESCRIPTOR_ENV] ?? path.join(defaultHarnessBrokerDirectory(environment), HARNESS_BROKER_DESCRIPTOR_FILE);
+}
+function harnessBrokerLaunchAgentLabel(harnessId = "claude-code") {
+  harnessPluginIdSchema.parse(harnessId);
+  return harnessId === "claude-code" ? "ai.bytepioneer.codexhost.native-harness-broker" : `ai.bytepioneer.codexhost.${harnessId}-broker`;
+}
+function harnessBrokerLaunchAgentPlistPath(environment = process.env, harnessId = "claude-code") {
+  const home = environment.HOME || os.homedir();
+  return path.join(home, "Library", "LaunchAgents", `${harnessBrokerLaunchAgentLabel(harnessId)}.plist`);
+}
+
 // ../../harness-broker/dist/client.js
 function unavailable(message, retryable = true) {
   return { code: "unavailable", message, retryable, stage: "harnessBroker" };
@@ -17250,6 +17401,7 @@ var BrokeredHarnessAdapter = class {
   commandCatalog;
   liveCommandCatalog;
   harnessId;
+  sessionImport;
   credits;
   refreshCredits;
   #descriptorPath;
@@ -17272,6 +17424,14 @@ var BrokeredHarnessAdapter = class {
   };
   constructor(input = {}) {
     this.harnessId = harnessPluginIdSchema.parse(input.harnessId ?? "claude-code");
+    if (input.sessionImport) {
+      this.sessionImport = createBrokerSessionImportCapability({
+        harnessId: this.harnessId,
+        request: async (method, params) => parseHarnessResult(await this.#request(method, params, method === "adapter.sessionImport.resolve")),
+        isClosed: () => this.#closed,
+        error: (error51) => this.#error(error51)
+      });
+    }
     if (input.accountCredits !== false) {
       this.credits = () => this.#credits;
       this.refreshCredits = () => this.#refreshAccountCredits();
@@ -18780,7 +18940,17 @@ function pendingNativeHistoryRewind(contents) {
   const last = parseRows(contents).findLast((row) => row.type === "resend-fork-notice" || NATIVE_MESSAGE_TYPES.has(text(row.type)));
   return last?.type === "resend-fork-notice" ? { forkPointId: text(last.parentId) || null } : void 0;
 }
+function isNativeCompactionSummary(row) {
+  const data = record2(row.providerData);
+  return row.type === "message" && row.role === "user" && data.isCompactInternal === true;
+}
 function nativeHistoryRows(contents) {
+  return collectNativeHistoryRows(contents, false);
+}
+function nativeDisplayHistoryRows(contents) {
+  return collectNativeHistoryRows(contents, true);
+}
+function collectNativeHistoryRows(contents, followCompactionParent) {
   const entries = /* @__PURE__ */ new Map();
   let leaf = "";
   for (const row of parseRows(contents)) {
@@ -18805,10 +18975,16 @@ function nativeHistoryRows(contents) {
       throw new CodeBuddyError("protocolError", "Native history parent is missing");
     chain.push(row);
     leaf = text(row.parentId);
+    if (!leaf && followCompactionParent && isNativeCompactionSummary(row)) {
+      const logicalParent = text(row.logicalParentId);
+      if (logicalParent && !entries.has(logicalParent))
+        throw new CodeBuddyError("protocolError", "Native compaction parent is missing");
+      leaf = logicalParent;
+    }
   }
   return chain.reverse();
 }
-function snapshotFromHistory(contents, ref, cwd, profile = CODEBUDDY_RUNTIME_PROFILE) {
+function snapshotFromHistory(contents, ref, cwd, profile = CODEBUDDY_RUNTIME_PROFILE, options = {}) {
   const supportsNativeCommands = nativeCommandsEnabled(profile);
   const supportsFork = capabilitiesForProfile(profile).history.fork;
   const turns = [];
@@ -18834,7 +19010,8 @@ function snapshotFromHistory(contents, ref, cwd, profile = CODEBUDDY_RUNTIME_PRO
       snapshot.item.outputTruncated = Boolean(output.truncated);
     }
   };
-  const history = nativeHistoryRows(contents);
+  const includeCompactionHistory = options.includeCompactionHistory !== false;
+  const history = includeCompactionHistory ? nativeDisplayHistoryRows(contents) : nativeHistoryRows(contents);
   const manualCompactions = /* @__PURE__ */ new Set();
   let compactUser;
   if (supportsNativeCommands)
@@ -18868,6 +19045,22 @@ function snapshotFromHistory(contents, ref, cwd, profile = CODEBUDDY_RUNTIME_PRO
       continue;
     if (supportsNativeCommands && row.type === "message" && row.role === "user" && data.agent === "compact" && !manualCompactions.has(text(row.id)))
       continue;
+    if (includeCompactionHistory && isNativeCompactionSummary(row)) {
+      if (supportsNativeCommands && current) {
+        const outcome = data.isCompacted === true ? { status: "succeeded" } : {
+          status: "failed",
+          error: nativeError(new CodeBuddyError("nativeFailure", "Native compaction did not complete"), profile)
+        };
+        current.items.push({
+          item: {
+            type: "contextCompaction",
+            itemId: hostItemIdSchema.parse(`compact-${text(row.id)}`)
+          },
+          outcome
+        });
+      }
+      continue;
+    }
     if (row.type === "message" && row.role === "user") {
       current = {
         nativeTurnRef: nativeTurnRefSchema.parse({
@@ -24215,7 +24408,9 @@ function commandCaveat(row) {
 }
 function retainedRowCount(input, contents, sourceCwd = input.cwd, profile = CODEBUDDY_RUNTIME_PROFILE) {
   const rows2 = nativeHistoryRows(contents);
-  const turns = snapshotFromHistory(contents, input.sourceRef, sourceCwd, profile).turns;
+  const turns = snapshotFromHistory(contents, input.sourceRef, sourceCwd, profile, {
+    includeCompactionHistory: false
+  }).turns;
   let excluded2;
   if (input.kind === "rollbackLastTurn") {
     if (!turns.length)
@@ -26819,6 +27014,7 @@ function createHarnessAdapter(context) {
       ...context.launchCommand ? { CODEXHOST_WORKBUDDY_COMMAND: context.launchCommand } : {}
     };
     return new BrokeredHarnessAdapter({
+      sessionImport: true,
       accountCredits: false,
       harnessId: "workbuddy",
       commandCatalog: WORKBUDDY_COMMAND_CATALOG,