@codexhost/cli-darwin-x64 0.8.0 → 0.9.1

package/app/plugins/kiro-cli/plugin.mjs

@@ -14526,6 +14526,46 @@ config(en_default());
 // ../../shared-contracts/dist/version.js
 var WORKSPACE_CONTRACT_VERSION = 1;
 
+// ../../shared-contracts/dist/idle-release.js
+var IDLE_RELEASE_TIMEOUT_MINUTES_MIN = 5;
+var IDLE_RELEASE_TIMEOUT_MINUTES_MAX = 1440;
+var idleReleaseSettingsSchema = external_exports.strictObject({
+  enabled: external_exports.boolean(),
+  timeoutMinutes: external_exports.number().int().min(IDLE_RELEASE_TIMEOUT_MINUTES_MIN).max(IDLE_RELEASE_TIMEOUT_MINUTES_MAX)
+});
+var DEFAULT_IDLE_RELEASE_SETTINGS = Object.freeze({
+  enabled: false,
+  timeoutMinutes: 30
+});
+
+// ../../shared-contracts/dist/loaded-sessions.js
+var loadedSessionStateSchema = external_exports.enum([
+  "idle",
+  "running",
+  "busy",
+  "closing",
+  "failed",
+  "blocked"
+]);
+var loadedSessionReasonSchema = external_exports.enum([
+  "none",
+  "disabled",
+  "timeout",
+  "operation",
+  "background",
+  "identity",
+  "persistence",
+  "closeFailed"
+]);
+var loadedSessionsSchema = external_exports.array(external_exports.strictObject({
+  threadId: external_exports.string(),
+  title: external_exports.string(),
+  harnessId: external_exports.string(),
+  state: loadedSessionStateSchema,
+  reason: loadedSessionReasonSchema,
+  inactiveMs: external_exports.number().nonnegative()
+}));
+
 // ../../shared-contracts/dist/ids.js
 var opaqueIdSchema = external_exports.string().refine((value) => value.trim().length > 0, {
   message: "Identifier must not be empty or whitespace"
@@ -15011,6 +15051,8 @@ var pluginPresentationShape = {
   id: harnessPluginIdSchema,
   name: external_exports.string().trim().min(1).max(128),
   version: external_exports.string().min(1).max(128),
+  /** The factory accepts a persisted local entrypoint through its construction context. */
+  launchCommand: external_exports.literal(true).optional(),
   links: external_exports.object({
     documentation: documentationUrlSchema.optional(),
     installation: documentationUrlSchema.optional()
@@ -15048,6 +15090,19 @@ var harnessPluginRouteSchema = external_exports.object({
   permissionModeId: harnessPermissionModeIdSchema.optional()
 }).strict();
 
+// ../../shared-contracts/dist/harness-launch-settings.js
+var harnessLaunchPathSchema = external_exports.string().trim().min(1).max(4096).refine((value) => !/[\u0000\r\n]/u.test(value), "Invalid entrypoint path");
+var harnessLaunchSettingsGetSchema = external_exports.object({
+  harnessId: harnessPluginIdSchema
+}).strict();
+var harnessLaunchSettingsSetSchema = harnessLaunchSettingsGetSchema.extend({
+  path: harnessLaunchPathSchema.nullable()
+});
+var harnessLaunchSettingsSchema = external_exports.object({
+  path: harnessLaunchPathSchema.nullable(),
+  restartRequired: external_exports.boolean()
+}).strict();
+
 // ../../shared-contracts/dist/codex-accounts.js
 var accountIdSchema = external_exports.string().min(1).max(256).regex(/^[A-Za-z0-9._~-]+$/u);
 var nonBlankTextSchema3 = external_exports.string().trim().min(1);
@@ -15076,75 +15131,15 @@ var codexAccountSchema = external_exports.object({
   email: external_exports.string().email().max(320).optional(),
   planType: codexAccountPlanTypeSchema.optional()
 }).strict();
-var codexAccountPhaseSchema = external_exports.enum(["ready", "changing", "unavailable"]);
-var codexAccountPendingOperationSchema = external_exports.object({
-  operationId: nonBlankTextSchema3.max(1024),
-  kind: external_exports.enum(["login", "switch", "logout", "recovery"])
-}).strict();
-var codexAccountCapabilitiesSchema = external_exports.object({
-  manage: external_exports.boolean(),
-  switch: external_exports.boolean(),
-  login: external_exports.boolean(),
-  delete: external_exports.boolean(),
-  recover: external_exports.boolean().optional(),
-  logout: external_exports.boolean().optional(),
-  reason: external_exports.enum([
-    "ssh-single-account",
-    "unsupported-storage",
-    "unsupported-version",
-    "recovery-required",
-    "keyring-unavailable",
-    "migration-required"
-  ]).optional()
-}).strict();
+var codexAccountPhaseSchema = external_exports.enum(["ready", "unavailable"]);
 var codexAccountListResultSchema = external_exports.object({
   version: external_exports.literal(2),
   currentAccountId: accountIdSchema.nullable(),
   phase: codexAccountPhaseSchema,
   revision: external_exports.number().int().nonnegative(),
   instanceId: nonBlankTextSchema3.max(1024).optional(),
-  cleanupRequired: external_exports.boolean().optional(),
-  /** Credentials were adopted; other native homes/history remain unmerged. */
-  legacyHistoryPreserved: external_exports.boolean().optional(),
-  pendingOperation: codexAccountPendingOperationSchema.optional(),
-  capabilities: codexAccountCapabilitiesSchema,
-  accounts: external_exports.array(codexAccountSchema).max(128)
-}).strict();
-var codexAccountActivateParamsSchema = external_exports.object({ accountId: accountIdSchema }).strict();
-var codexAccountSwitchParamsSchema = external_exports.object({ accountId: accountIdSchema }).strict();
-var codexAccountReadyMutationResultShape = {
-  phase: external_exports.literal("ready"),
-  revision: external_exports.number().int().nonnegative()
-};
-var codexAccountSwitchResultSchema = external_exports.object({
-  currentAccountId: accountIdSchema,
-  ...codexAccountReadyMutationResultShape
-}).strict();
-var codexAccountDeleteParamsSchema = external_exports.object({ accountId: accountIdSchema }).strict();
-var codexAccountDeleteResultSchema = external_exports.object({ deletedAccountId: accountIdSchema }).strict();
-var codexAccountLoginStartParamsSchema = external_exports.object({ accountId: accountIdSchema.optional() }).strict();
-var codexAccountLoginStartResultSchema = external_exports.object({
-  accountId: accountIdSchema,
-  loginId: nonBlankTextSchema3.max(1024),
-  verificationUrl: external_exports.string().url().max(16384),
-  userCode: nonBlankTextSchema3.max(1024)
+  accounts: external_exports.array(codexAccountSchema).max(1)
 }).strict();
-var codexAccountLoginCancelParamsSchema = external_exports.object({ loginId: nonBlankTextSchema3.max(1024) }).strict();
-var codexAccountLoginCancelResultSchema = external_exports.object({ cancelled: external_exports.boolean() }).strict();
-var codexAccountLoginCompletedSchema = external_exports.object({
-  accountId: accountIdSchema,
-  loginId: nonBlankTextSchema3.max(1024),
-  success: external_exports.boolean(),
-  error: external_exports.string().max(4096).nullable(),
-  saved: external_exports.boolean().optional(),
-  cleanupRequired: external_exports.boolean().optional()
-}).strict();
-var codexAccountLogoutParamsSchema = external_exports.object({}).strict();
-var codexAccountLogoutResultSchema = external_exports.object({
-  currentAccountId: external_exports.null(),
-  ...codexAccountReadyMutationResultShape
-}).strict();
-var codexAccountRecoverParamsSchema = external_exports.object({}).strict();
 var codexAccountUsageParamsSchema = external_exports.object({ accountId: accountIdSchema, refresh: external_exports.boolean().optional() }).strict();
 var codexAccountUsageResultSchema = external_exports.object({
   accountId: accountIdSchema,
@@ -15153,21 +15148,6 @@ var codexAccountUsageResultSchema = external_exports.object({
   freshness: external_exports.enum(["live", "cached"]),
   observedAt: external_exports.string().datetime().nullable()
 }).strict();
-var codexAccountResetCreditConsumeParamsSchema = external_exports.object({
-  accountId: accountIdSchema,
-  idempotencyKey: external_exports.string().uuid().optional()
-}).strict();
-var codexAccountResetCreditConsumeOutcomeSchema = external_exports.enum([
-  "reset",
-  "nothingToReset",
-  "noCredit",
-  "alreadyRedeemed"
-]);
-var codexAccountResetCreditConsumeResultSchema = external_exports.object({
-  accountId: accountIdSchema,
-  outcome: codexAccountResetCreditConsumeOutcomeSchema,
-  accountCredits: accountCreditsSnapshotSchema.optional()
-}).strict();
 
 // ../../shared-contracts/dist/harness-session-import.js
 var HARNESS_SESSION_IMPORT_ID_MAX_LENGTH = 1024;
@@ -21753,6 +21733,7 @@ var KiroTurnOutput = class {
       const file2 = {
         type: "fileChange",
         itemId: hostItemIdSchema.parse(`file-${tool.item.itemId}`),
+        sourceItemIds: [tool.item.itemId],
         changes: changes ?? []
       };
       if (tool.file) {
@@ -22136,6 +22117,10 @@ async function readKiroSnapshot(location) {
     const completedAtMs = Date.parse(end?.timestamp ?? "");
     const hasTiming = Number.isFinite(startedAtMs) && Number.isFinite(completedAtMs) && startedAtMs >= 0 && completedAtMs >= startedAtMs;
     const lastContent = turn.rows.findLast((row) => row.payload.type === "tool_call" || row.payload.type === "assistant" && kiroVisibleText(historyText(row.payload)).trim().length > 0 && !["Reasoning", "Summary"].includes(String(row.payload.operationType)));
+    const toolSources = new Map(turn.rows.filter((row) => row.payload.type === "tool_call").map((row) => [
+      row.payload.toolCallId,
+      hostItemIdSchema.parse(`kiro-${nativeSessionId}-${row.id}`)
+    ]));
     for (const row of turn.rows) {
       const type = row.payload?.type;
       const itemId = hostItemIdSchema.parse(`kiro-${nativeSessionId}-${row.id}`);
@@ -22186,10 +22171,12 @@ async function readKiroSnapshot(location) {
       } else if (type === "tool_result") {
         const changes = row.payload.success === true ? projectKiroFileChanges(row.payload.content, location.cwd) : null;
         if (changes) {
+          const sourceItemId = toolSources.get(row.payload.toolCallId);
           items.push({
             item: {
               type: "fileChange",
               itemId,
+              sourceItemIds: sourceItemId ? [sourceItemId] : [],
               changes
             },
             outcome: { status: "succeeded" }
@@ -23050,12 +23037,12 @@ var KiroSession = class {
     return { ok: true, value: { accepted: true } };
   }
   async #selectModel(command) {
-    if (this.#activeTurnId !== null || this.#configBusy) {
+    if (this.#configBusy) {
       return {
         ok: false,
         error: {
           code: "sessionBusy",
-          message: "Cannot change model while turn is active",
+          message: "Another configuration change is in progress",
           retryable: false
         }
       };
@@ -23146,7 +23133,7 @@ var KiroSession = class {
     });
   }
   async #selectThinking(command) {
-    if (this.#activeTurnId !== null || this.#configBusy) {
+    if (this.#configBusy) {
       return {
         ok: false,
         error: { code: "sessionBusy", message: "Session is busy", retryable: true }

package/app/plugins/omp/plugin.mjs

@@ -15046,6 +15046,46 @@ config(en_default());
 // ../../shared-contracts/dist/version.js
 var WORKSPACE_CONTRACT_VERSION = 1;
 
+// ../../shared-contracts/dist/idle-release.js
+var IDLE_RELEASE_TIMEOUT_MINUTES_MIN = 5;
+var IDLE_RELEASE_TIMEOUT_MINUTES_MAX = 1440;
+var idleReleaseSettingsSchema = external_exports.strictObject({
+  enabled: external_exports.boolean(),
+  timeoutMinutes: external_exports.number().int().min(IDLE_RELEASE_TIMEOUT_MINUTES_MIN).max(IDLE_RELEASE_TIMEOUT_MINUTES_MAX)
+});
+var DEFAULT_IDLE_RELEASE_SETTINGS = Object.freeze({
+  enabled: false,
+  timeoutMinutes: 30
+});
+
+// ../../shared-contracts/dist/loaded-sessions.js
+var loadedSessionStateSchema = external_exports.enum([
+  "idle",
+  "running",
+  "busy",
+  "closing",
+  "failed",
+  "blocked"
+]);
+var loadedSessionReasonSchema = external_exports.enum([
+  "none",
+  "disabled",
+  "timeout",
+  "operation",
+  "background",
+  "identity",
+  "persistence",
+  "closeFailed"
+]);
+var loadedSessionsSchema = external_exports.array(external_exports.strictObject({
+  threadId: external_exports.string(),
+  title: external_exports.string(),
+  harnessId: external_exports.string(),
+  state: loadedSessionStateSchema,
+  reason: loadedSessionReasonSchema,
+  inactiveMs: external_exports.number().nonnegative()
+}));
+
 // ../../shared-contracts/dist/ids.js
 var opaqueIdSchema = external_exports.string().refine((value) => value.trim().length > 0, {
   message: "Identifier must not be empty or whitespace"
@@ -15531,6 +15571,8 @@ var pluginPresentationShape = {
   id: harnessPluginIdSchema,
   name: external_exports.string().trim().min(1).max(128),
   version: external_exports.string().min(1).max(128),
+  /** The factory accepts a persisted local entrypoint through its construction context. */
+  launchCommand: external_exports.literal(true).optional(),
   links: external_exports.object({
     documentation: documentationUrlSchema.optional(),
     installation: documentationUrlSchema.optional()
@@ -15568,6 +15610,19 @@ var harnessPluginRouteSchema = external_exports.object({
   permissionModeId: harnessPermissionModeIdSchema.optional()
 }).strict();
 
+// ../../shared-contracts/dist/harness-launch-settings.js
+var harnessLaunchPathSchema = external_exports.string().trim().min(1).max(4096).refine((value) => !/[\u0000\r\n]/u.test(value), "Invalid entrypoint path");
+var harnessLaunchSettingsGetSchema = external_exports.object({
+  harnessId: harnessPluginIdSchema
+}).strict();
+var harnessLaunchSettingsSetSchema = harnessLaunchSettingsGetSchema.extend({
+  path: harnessLaunchPathSchema.nullable()
+});
+var harnessLaunchSettingsSchema = external_exports.object({
+  path: harnessLaunchPathSchema.nullable(),
+  restartRequired: external_exports.boolean()
+}).strict();
+
 // ../../shared-contracts/dist/codex-accounts.js
 var accountIdSchema = external_exports.string().min(1).max(256).regex(/^[A-Za-z0-9._~-]+$/u);
 var nonBlankTextSchema3 = external_exports.string().trim().min(1);
@@ -15596,75 +15651,15 @@ var codexAccountSchema = external_exports.object({
   email: external_exports.string().email().max(320).optional(),
   planType: codexAccountPlanTypeSchema.optional()
 }).strict();
-var codexAccountPhaseSchema = external_exports.enum(["ready", "changing", "unavailable"]);
-var codexAccountPendingOperationSchema = external_exports.object({
-  operationId: nonBlankTextSchema3.max(1024),
-  kind: external_exports.enum(["login", "switch", "logout", "recovery"])
-}).strict();
-var codexAccountCapabilitiesSchema = external_exports.object({
-  manage: external_exports.boolean(),
-  switch: external_exports.boolean(),
-  login: external_exports.boolean(),
-  delete: external_exports.boolean(),
-  recover: external_exports.boolean().optional(),
-  logout: external_exports.boolean().optional(),
-  reason: external_exports.enum([
-    "ssh-single-account",
-    "unsupported-storage",
-    "unsupported-version",
-    "recovery-required",
-    "keyring-unavailable",
-    "migration-required"
-  ]).optional()
-}).strict();
+var codexAccountPhaseSchema = external_exports.enum(["ready", "unavailable"]);
 var codexAccountListResultSchema = external_exports.object({
   version: external_exports.literal(2),
   currentAccountId: accountIdSchema.nullable(),
   phase: codexAccountPhaseSchema,
   revision: external_exports.number().int().nonnegative(),
   instanceId: nonBlankTextSchema3.max(1024).optional(),
-  cleanupRequired: external_exports.boolean().optional(),
-  /** Credentials were adopted; other native homes/history remain unmerged. */
-  legacyHistoryPreserved: external_exports.boolean().optional(),
-  pendingOperation: codexAccountPendingOperationSchema.optional(),
-  capabilities: codexAccountCapabilitiesSchema,
-  accounts: external_exports.array(codexAccountSchema).max(128)
-}).strict();
-var codexAccountActivateParamsSchema = external_exports.object({ accountId: accountIdSchema }).strict();
-var codexAccountSwitchParamsSchema = external_exports.object({ accountId: accountIdSchema }).strict();
-var codexAccountReadyMutationResultShape = {
-  phase: external_exports.literal("ready"),
-  revision: external_exports.number().int().nonnegative()
-};
-var codexAccountSwitchResultSchema = external_exports.object({
-  currentAccountId: accountIdSchema,
-  ...codexAccountReadyMutationResultShape
-}).strict();
-var codexAccountDeleteParamsSchema = external_exports.object({ accountId: accountIdSchema }).strict();
-var codexAccountDeleteResultSchema = external_exports.object({ deletedAccountId: accountIdSchema }).strict();
-var codexAccountLoginStartParamsSchema = external_exports.object({ accountId: accountIdSchema.optional() }).strict();
-var codexAccountLoginStartResultSchema = external_exports.object({
-  accountId: accountIdSchema,
-  loginId: nonBlankTextSchema3.max(1024),
-  verificationUrl: external_exports.string().url().max(16384),
-  userCode: nonBlankTextSchema3.max(1024)
-}).strict();
-var codexAccountLoginCancelParamsSchema = external_exports.object({ loginId: nonBlankTextSchema3.max(1024) }).strict();
-var codexAccountLoginCancelResultSchema = external_exports.object({ cancelled: external_exports.boolean() }).strict();
-var codexAccountLoginCompletedSchema = external_exports.object({
-  accountId: accountIdSchema,
-  loginId: nonBlankTextSchema3.max(1024),
-  success: external_exports.boolean(),
-  error: external_exports.string().max(4096).nullable(),
-  saved: external_exports.boolean().optional(),
-  cleanupRequired: external_exports.boolean().optional()
-}).strict();
-var codexAccountLogoutParamsSchema = external_exports.object({}).strict();
-var codexAccountLogoutResultSchema = external_exports.object({
-  currentAccountId: external_exports.null(),
-  ...codexAccountReadyMutationResultShape
+  accounts: external_exports.array(codexAccountSchema).max(1)
 }).strict();
-var codexAccountRecoverParamsSchema = external_exports.object({}).strict();
 var codexAccountUsageParamsSchema = external_exports.object({ accountId: accountIdSchema, refresh: external_exports.boolean().optional() }).strict();
 var codexAccountUsageResultSchema = external_exports.object({
   accountId: accountIdSchema,
@@ -15673,21 +15668,6 @@ var codexAccountUsageResultSchema = external_exports.object({
   freshness: external_exports.enum(["live", "cached"]),
   observedAt: external_exports.string().datetime().nullable()
 }).strict();
-var codexAccountResetCreditConsumeParamsSchema = external_exports.object({
-  accountId: accountIdSchema,
-  idempotencyKey: external_exports.string().uuid().optional()
-}).strict();
-var codexAccountResetCreditConsumeOutcomeSchema = external_exports.enum([
-  "reset",
-  "nothingToReset",
-  "noCredit",
-  "alreadyRedeemed"
-]);
-var codexAccountResetCreditConsumeResultSchema = external_exports.object({
-  accountId: accountIdSchema,
-  outcome: codexAccountResetCreditConsumeOutcomeSchema,
-  accountCredits: accountCreditsSnapshotSchema.optional()
-}).strict();
 
 // ../../shared-contracts/dist/harness-session-import.js
 var HARNESS_SESSION_IMPORT_ID_MAX_LENGTH = 1024;
@@ -16619,7 +16599,7 @@ function withNodeRuntimeOnPath(environment, runtimeExecutable = process.execPath
   const directories = (environment[pathKey] ?? "").split(delimiter).filter(Boolean);
   const equal = platform === "win32" ? (value) => value.toLowerCase() : (value) => value;
   if (!directories.some((directory) => equal(directory) === equal(runtimeDirectory))) {
-    directories.unshift(runtimeDirectory);
+    directories.push(runtimeDirectory);
   }
   return { ...environment, [pathKey]: directories.join(delimiter) };
 }
@@ -17244,7 +17224,8 @@ function ompRpcProcessCommand(options, dependencies = {}) {
   const permissionArguments = options.permissionMode ? ["--approval-mode", options.permissionMode] : [];
   const arguments_ = [
     "--mode",
-    "rpc",
+    // OMP only creates ask and connects its tool UI in rpc-ui mode.
+    "rpc-ui",
     ...permissionArguments,
     ...modelArguments,
     ...sessionArguments
@@ -17592,7 +17573,12 @@ var OmpRpcSession = class {
     if ("confirmed" in response && pending.request.method !== "confirm") {
       throw new Error("Omp RPC confirmation does not match the request");
     }
-    const frame = "cancelled" in response ? { type: "extension_ui_response", id: response.requestId, cancelled: true } : "confirmed" in response ? { type: "extension_ui_response", id: response.requestId, confirmed: response.confirmed } : { type: "extension_ui_response", id: response.requestId, value: response.value };
+    const frame = "cancelled" in response ? {
+      type: "extension_ui_response",
+      id: response.requestId,
+      cancelled: true,
+      ...reason === "expired" ? { timedOut: true } : {}
+    } : "confirmed" in response ? { type: "extension_ui_response", id: response.requestId, confirmed: response.confirmed } : { type: "extension_ui_response", id: response.requestId, value: response.value };
     if (!active.interactions.delete(response.requestId)) {
       throw new Error("Omp RPC interaction is not pending");
     }
@@ -17902,11 +17888,19 @@ var OmpRpcSession = class {
       if (!Array.isArray(value.options) || value.options.length === 0 || !value.options.every((option) => typeof option === "string" && option.length > 0)) {
         throw new OmpRpcFaultError("protocolError", "Omp RPC select request has invalid options");
       }
+      let optionDetails;
+      if (value.optionDetails !== void 0) {
+        if (!Array.isArray(value.optionDetails) || value.optionDetails.length !== value.options.length || !value.optionDetails.every((detail) => typeof detail === "object" && detail !== null && !Array.isArray(detail) && (detail.description === void 0 || typeof detail.description === "string"))) {
+          throw new OmpRpcFaultError("protocolError", "Omp RPC select option details are invalid");
+        }
+        optionDetails = value.optionDetails.map(({ description }) => description === void 0 ? {} : { description });
+      }
       request = {
         requestId,
         method,
         title,
         options: [...value.options],
+        ...optionDetails ? { optionDetails } : {},
         ...typeof timeoutMs === "number" ? { timeoutMs } : {}
       };
     } else if (method === "confirm") {
@@ -18001,8 +17995,13 @@ var OmpRpcSession = class {
   }
   #updateTool(active, value) {
     const callId = value.toolCallId;
-    const outputResult = jsonValueSchema.safeParse(value.partialResult);
-    if (typeof callId !== "string" || !active.tools.has(callId) || !outputResult.success) {
+    if (typeof callId !== "string" || callId.length === 0) {
+      throw new OmpRpcFaultError("protocolError", "Omp RPC returned an invalid Tool update");
+    }
+    if (!active.tools.has(callId))
+      return;
+    const outputResult = jsonValueSchema.safeParse(value.partialResult ?? null);
+    if (!outputResult.success) {
       throw new OmpRpcFaultError("protocolError", "Omp RPC returned an invalid Tool update");
     }
     active.onEvent({ type: "tool.updated", callId, output: outputResult.data });
@@ -18010,9 +18009,14 @@ var OmpRpcSession = class {
   #completeTool(active, value) {
     const callId = value.toolCallId;
     const toolName = value.toolName;
+    if (typeof callId !== "string" || callId.length === 0) {
+      throw new OmpRpcFaultError("protocolError", "Omp RPC returned an invalid Tool end");
+    }
+    const expectedName = active.tools.get(callId);
+    if (expectedName === void 0)
+      return;
     const result = jsonValueSchema.safeParse(value.result);
-    const expectedName = typeof callId === "string" ? active.tools.get(callId) : void 0;
-    if (typeof callId !== "string" || typeof toolName !== "string" || expectedName !== toolName || value.isError !== void 0 && typeof value.isError !== "boolean" || !result.success) {
+    if (typeof toolName !== "string" || expectedName !== toolName || value.isError !== void 0 && typeof value.isError !== "boolean" || !result.success) {
       throw new OmpRpcFaultError("protocolError", "Omp RPC returned an invalid Tool end");
     }
     active.tools.delete(callId);
@@ -18644,7 +18648,8 @@ function synthesizeFileChange(kind, args, cwd) {
       {
         path: displayed.path,
         kind: "add",
-        unifiedDiff: createTwoFilesPatch(oldHeader2, newHeader2, "", content, "", "", { context: 3 })
+        unifiedDiff: createTwoFilesPatch(oldHeader2, newHeader2, "", content, "", "", { context: 3 }),
+        diffScope: "fragment"
       }
     ];
   }
@@ -18666,7 +18671,8 @@ function synthesizeFileChange(kind, args, cwd) {
       kind: "update",
       unifiedDiff: createTwoFilesPatch(oldHeader, newHeader, oldText, newText, "", "", {
         context: 3
-      })
+      }),
+      diffScope: "fragment"
     }
   ];
 }
@@ -19060,7 +19066,7 @@ var OmpHarnessSession = class {
     return this.#closePromise;
   }
   async #selectModel(command) {
-    if (this.#acceptingTurn || this.#active || this.#configuring) {
+    if (this.#acceptingTurn || this.#configuring) {
       return {
         ok: false,
         error: {
@@ -19132,7 +19138,7 @@ var OmpHarnessSession = class {
         }
       };
     }
-    if (this.#acceptingTurn || this.#active || this.#configuring) {
+    if (this.#acceptingTurn || this.#configuring) {
       return {
         ok: false,
         error: {
@@ -19695,7 +19701,11 @@ var OmpHarnessSession = class {
         id: "answer",
         type: "choice",
         prompt: request.title,
-        options: request.options.map((option) => ({ value: option, label: option })),
+        options: request.options.map((option, index) => ({
+          value: option,
+          label: option,
+          ...request.optionDetails?.[index]?.description ? { description: request.optionDetails[index].description } : {}
+        })),
         multiple: false,
         allowOther: false,
         optional: false
@@ -19917,12 +19927,17 @@ var OmpHarnessSession = class {
       try {
         const kind = fileMutatingKind(event.toolName);
         const args = tool.arguments;
-        if (kind && synthesizeFileChange(kind, args, this.#cwd)) {
+        if (kind && !patchFromResult(event.result) && synthesizeFileChange(kind, args, this.#cwd)) {
           return;
         }
         const changes = reliableFileChange(event.toolName, args, event.result, this.#cwd);
         if (changes) {
-          const fileItem = { type: "fileChange", itemId: this.#newItemId(), changes };
+          const fileItem = {
+            type: "fileChange",
+            itemId: this.#newItemId(),
+            sourceItemIds: [tool.item.itemId],
+            changes
+          };
           this.#event({ type: "item.started", turnId: active.command.turnId, item: fileItem });
           this.#completeItem(active, fileItem, { status: "succeeded" });
         }