@spotpatch/runtime 1.1.2 → 1.2.0

package/dist/index.js

@@ -86,6 +86,7 @@ import {
   AGENT_CHECK_STATUSES,
   AGENT_FILE_CHANGE_KINDS,
   AGENT_JOB_STATUSES,
+  AGENT_WORKSPACE_STATES,
   ERROR_CODES
 } from "@spotpatch/shared";
 var ERROR_CODE_VALUES = new Set(Object.values(ERROR_CODES));
@@ -93,6 +94,7 @@ var CAPABILITY_STATE_VALUES = new Set(AGENT_CAPABILITY_STATES);
 var CHECK_STATUS_VALUES = new Set(AGENT_CHECK_STATUSES);
 var FILE_CHANGE_KIND_VALUES = new Set(AGENT_FILE_CHANGE_KINDS);
 var JOB_STATUS_VALUES = new Set(AGENT_JOB_STATUSES);
+var WORKSPACE_STATE_VALUES = new Set(AGENT_WORKSPACE_STATES);
 var PROFILE_ID_PATTERN = /^[A-Za-z0-9][A-Za-z0-9._-]*$/;
 var JOB_ID_PATTERN = /^[A-Za-z0-9_-]+$/;
 var ISO_TIMESTAMP_PATTERN = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d{1,9})?Z$/;
@@ -146,6 +148,35 @@ function isAgentCapabilitySnapshot(value) {
   }
   return isProfileId(value.providerProfileId) && isBoundedString(value.providerLabel, 100) && isProfileId(value.modelProfileId) && isBoundedString(value.modelLabel, 100) && (value.protocol === "responses" || value.protocol === "chat-completions") && typeof value.state === "string" && CAPABILITY_STATE_VALUES.has(value.state) && typeof value.authenticated === "boolean" && typeof value.modelAvailable === "boolean" && typeof value.toolCalling === "boolean" && typeof value.toolResultContinuation === "boolean" && typeof value.streaming === "boolean" && (value.checkedAt === void 0 || isIsoTimestamp(value.checkedAt)) && (value.errorCode === void 0 || isAgentErrorCode(value.errorCode));
 }
+function isAgentWorkspaceHealthSnapshot(value) {
+  if (!isRecord(value) || !hasOnlyKeys(value, [
+    "state",
+    "checkedAt",
+    "changes",
+    "canIncludeLocalChanges",
+    "errorCode"
+  ]) || typeof value.state !== "string" || !WORKSPACE_STATE_VALUES.has(value.state) || !isIsoTimestamp(value.checkedAt) || typeof value.canIncludeLocalChanges !== "boolean" || value.errorCode !== void 0 && !isAgentErrorCode(value.errorCode) || !isRecord(value.changes) || !hasOnlyKeys(value.changes, [
+    "staged",
+    "unstaged",
+    "untracked",
+    "conflicted",
+    "total"
+  ])) {
+    return false;
+  }
+  const changes = value.changes;
+  const { staged, unstaged, untracked, conflicted, total } = changes;
+  if (!isNonnegativeInteger(staged) || !isNonnegativeInteger(unstaged) || !isNonnegativeInteger(untracked) || !isNonnegativeInteger(conflicted) || !isNonnegativeInteger(total) || total < staged || total < unstaged || total < untracked || total < conflicted || total > staged + unstaged + untracked) {
+    return false;
+  }
+  if (value.state === "ready") {
+    return total === 0 && !value.canIncludeLocalChanges && value.errorCode === void 0;
+  }
+  if (value.state === "consent-required") {
+    return total > 0 && conflicted === 0 && value.canIncludeLocalChanges && value.errorCode === void 0;
+  }
+  return !value.canIncludeLocalChanges && value.errorCode !== void 0;
+}
 function isAgentJobSnapshot(value) {
   if (!isRecord(value) || !hasOnlyKeys(value, [
     "jobId",
@@ -486,6 +517,17 @@ function createRuntimeApi(options) {
         request
       );
     },
+    async agentWorkspaceHealth() {
+      const data = await requestJson(
+        SPOTPATCH_ENDPOINTS.agentWorkspaceHealth,
+        "POST",
+        emptyAction
+      );
+      if (!isAgentWorkspaceHealthSnapshot(data)) {
+        throw new RuntimeApiError();
+      }
+      return deepFreeze(data);
+    },
     async createAgentJob(request) {
       const serverRequest = omitBrowserCodeContext(request);
       return parseJobSnapshot(
@@ -1563,15 +1605,65 @@ var AGENT_PANEL_STYLES = `
     min-height: 46px;
     margin-top: 7px;
     border: 1px solid var(--spotpatch-border);
-    border-radius: 10px;
-    padding: 8px 30px 8px 10px;
+    border-radius: 12px;
+    padding: 10px 38px 10px 13px;
     color: #e8ebf2;
     color-scheme: dark;
-    background: var(--spotpatch-bg-raised);
+    background: linear-gradient(180deg, rgb(255 255 255 / 4%), rgb(255 255 255 / 2%));
     font-size: 15px;
+    font-weight: 560;
+    line-height: 1.35;
     outline: none;
+    transition: border-color 160ms ease, background-color 160ms ease, box-shadow 160ms ease;
+  }
+  .spotpatch-agent select:hover { border-color: rgb(148 163 184 / 38%); background-color: rgb(255 255 255 / 5%); }
+  .spotpatch-agent select:focus-visible { border-color: rgb(139 124 247 / 76%); box-shadow: 0 0 0 3px rgb(109 93 246 / 18%); }
+  .spotpatch-agent select option { min-height: 42px; color: #e8ebf2; background: #10151e; }
+  @supports (appearance: base-select) {
+    .spotpatch-agent select,
+    ::picker(select) { appearance: base-select; }
+    .spotpatch-agent select { padding: 10px 13px; }
+    .spotpatch-agent select::picker-icon {
+      color: #9da6b5;
+      transition: rotate 180ms cubic-bezier(.2, .8, .2, 1), color 160ms ease;
+    }
+    .spotpatch-agent select:open::picker-icon { rotate: 180deg; color: #c4b5fd; }
+    .spotpatch-agent select::picker(select) {
+      top: calc(anchor(bottom) + 7px);
+      left: anchor(left);
+      width: anchor-size(width);
+      max-height: min(280px, 40vh);
+      margin: 0;
+      overflow: hidden;
+      border: 1px solid rgb(139 124 247 / 28%);
+      border-radius: 12px;
+      padding: 6px;
+      color: #e8ebf2;
+      background: #10151e;
+      box-shadow: 0 18px 50px rgb(0 0 0 / 38%), 0 0 0 1px rgb(255 255 255 / 3%);
+      opacity: 0;
+      transform: translateY(-5px) scale(.985);
+      transform-origin: top center;
+      transition: opacity 150ms ease, transform 180ms cubic-bezier(.2, .8, .2, 1), overlay 180ms allow-discrete, display 180ms allow-discrete;
+    }
+    ::picker(select):popover-open { opacity: 1; transform: translateY(0) scale(1); }
+    @starting-style {
+      ::picker(select):popover-open { opacity: 0; transform: translateY(-5px) scale(.985); }
+    }
+    .spotpatch-agent select option {
+      min-height: 42px;
+      border-radius: 8px;
+      padding: 10px 12px;
+      color: #dfe4ee;
+      background: transparent;
+      cursor: pointer;
+      transition: color 120ms ease, background-color 120ms ease;
+    }
+    .spotpatch-agent select option:hover,
+    .spotpatch-agent select option:focus { color: #fff; background: rgb(109 93 246 / 16%); }
+    .spotpatch-agent select option:checked { color: #fff; background: rgb(109 93 246 / 24%); }
+    .spotpatch-agent select option::checkmark { color: #8b7cf7; }
   }
-  .spotpatch-agent select option { color: #e8ebf2; background: #10151e; }
   .spotpatch-agent select:focus-visible,
   .spotpatch-consent input:focus-visible {
     outline: 2px solid #8b7cf7;
@@ -1588,11 +1680,22 @@ var AGENT_PANEL_STYLES = `
     line-height: 1.6;
   }
   .spotpatch-consent input { width: 16px; height: 16px; flex: none; margin: 3px 0 0; accent-color: var(--spotpatch-accent); }
+  .spotpatch-workspace-consent {
+    margin-top: 12px;
+    border: 1px solid rgb(251 191 36 / 18%);
+    border-radius: 10px;
+    padding: 11px 12px;
+    background: rgb(120 53 15 / 9%);
+  }
+  .spotpatch-workspace-consent strong { display: block; color: #fde68a; font-size: 13px; font-weight: 620; }
+  .spotpatch-workspace-consent small { display: block; margin-top: 2px; color: #aeb6c4; font-size: 12px; line-height: 1.5; }
+  .spotpatch-agent-health-list { display: grid; gap: 8px; margin-top: 14px; }
+  .spotpatch-agent-workspace,
   .spotpatch-agent-capability {
     display: flex;
     align-items: center;
     gap: 8px;
-    margin: 14px 0 0;
+    margin: 0;
     color: #929bab;
     font-size: 13px;
   }
@@ -1609,6 +1712,21 @@ var AGENT_PANEL_STYLES = `
   .spotpatch-agent-capability[data-state="ready"]::before { background: var(--spotpatch-success); }
   .spotpatch-agent-capability[data-state="error"] { color: #fecaca; }
   .spotpatch-agent-capability[data-state="error"]::before { background: var(--spotpatch-danger); }
+  .spotpatch-agent-workspace::before {
+    width: 6px;
+    height: 6px;
+    flex: none;
+    border-radius: 999px;
+    background: #64748b;
+    content: "";
+  }
+  .spotpatch-agent-workspace[data-state="checking"]::before { background: var(--spotpatch-warning); }
+  .spotpatch-agent-workspace[data-state="ready"] { color: #a7f3d0; }
+  .spotpatch-agent-workspace[data-state="ready"]::before { background: var(--spotpatch-success); }
+  .spotpatch-agent-workspace[data-state="consent-required"] { color: #fde68a; }
+  .spotpatch-agent-workspace[data-state="consent-required"]::before { background: #fbbf24; }
+  .spotpatch-agent-workspace[data-state="blocked"] { color: #fecaca; }
+  .spotpatch-agent-workspace[data-state="blocked"]::before { background: var(--spotpatch-danger); }
   .spotpatch-agent-job { padding: 16px; }
   .spotpatch-agent-job-meta { display: flex; align-items: center; justify-content: space-between; gap: 10px; }
   .spotpatch-agent-model { min-width: 0; overflow: hidden; color: #d6dafe; font-size: 13px; text-overflow: ellipsis; white-space: nowrap; }
@@ -1697,10 +1815,26 @@ function createAgentPanel(document, ai, localizer) {
   consentCheckbox.type = "checkbox";
   const consentText = createMarkedElement(document, "span");
   consent.append(consentCheckbox, consentText);
+  const workspaceConsent = createMarkedElement(document, "label");
+  workspaceConsent.className = "spotpatch-consent spotpatch-workspace-consent";
+  workspaceConsent.hidden = true;
+  const workspaceConsentCheckbox = createMarkedElement(document, "input");
+  workspaceConsentCheckbox.type = "checkbox";
+  const workspaceConsentContent = createMarkedElement(document, "span");
+  const workspaceConsentTitle = createMarkedElement(document, "strong");
+  const workspaceConsentHelp = createMarkedElement(document, "small");
+  workspaceConsentContent.append(workspaceConsentTitle, workspaceConsentHelp);
+  workspaceConsent.append(workspaceConsentCheckbox, workspaceConsentContent);
+  const healthList = createMarkedElement(document, "div");
+  healthList.className = "spotpatch-agent-health-list";
+  const workspace = createMarkedElement(document, "p");
+  workspace.className = "spotpatch-agent-workspace";
+  workspace.dataset.state = "idle";
   const capability = createMarkedElement(document, "p");
   capability.className = "spotpatch-agent-capability";
   capability.dataset.state = "idle";
-  setup.append(selectors, consent, capability);
+  healthList.append(workspace, capability);
+  setup.append(selectors, consent, workspaceConsent, healthList);
   const job = createMarkedElement(document, "div");
   job.className = "spotpatch-agent-job";
   job.hidden = true;
@@ -1759,6 +1893,9 @@ function createAgentPanel(document, ai, localizer) {
   let latestCapabilityState = "idle";
   let latestCapabilityMessage = messages.agent.connectionNotTested;
   let latestCapabilityErrorCode;
+  let latestWorkspaceState = "idle";
+  let latestWorkspaceSnapshot;
+  let latestWorkspaceErrorCode;
   for (const provider of providers) {
     addOption(document, providerSelect, provider.id, provider.label);
   }
@@ -1786,7 +1923,7 @@ function createAgentPanel(document, ai, localizer) {
     testButton.hidden = !setupVisible;
     runButton.hidden = !setupVisible;
     testButton.disabled = !editingEnabled || capabilityProbing || selectedProvider() === void 0;
-    runButton.disabled = !editingEnabled || capabilityProbing || !contextReady || !consentCheckbox.checked || selectedProvider() === void 0 || modelSelect.value.length === 0;
+    runButton.disabled = !editingEnabled || capabilityProbing || !contextReady || !consentCheckbox.checked || latestWorkspaceState === "idle" || latestWorkspaceState === "checking" || latestWorkspaceState === "blocked" || latestWorkspaceState === "consent-required" && !workspaceConsentCheckbox.checked || selectedProvider() === void 0 || modelSelect.value.length === 0;
     if (!jobPresented || !selectionVisible) {
       cancelButton.hidden = true;
       applyButton.hidden = true;
@@ -1794,6 +1931,24 @@ function createAgentPanel(document, ai, localizer) {
       resetButton.hidden = true;
     }
   };
+  const renderWorkspaceMessage = () => {
+    if (latestWorkspaceState === "idle") {
+      workspace.textContent = messages.agent.workspaceNotChecked;
+    } else if (latestWorkspaceState === "checking") {
+      workspace.textContent = messages.agent.checkingWorkspace;
+    } else if (latestWorkspaceState === "ready") {
+      workspace.textContent = messages.agent.workspaceReady;
+    } else if (latestWorkspaceState === "consent-required") {
+      const changes = latestWorkspaceSnapshot?.changes;
+      workspace.textContent = messages.agent.workspaceDirty(
+        changes?.staged ?? 0,
+        changes?.unstaged ?? 0,
+        changes?.untracked ?? 0
+      );
+    } else {
+      workspace.textContent = latestWorkspaceErrorCode === void 0 ? messages.errors.INTERNAL_ERROR : messages.errors[latestWorkspaceErrorCode];
+    }
+  };
   function handleProviderChange() {
     populateModels();
     consentCheckbox.checked = false;
@@ -1818,6 +1973,7 @@ function createAgentPanel(document, ai, localizer) {
   providerSelect.addEventListener("change", handleProviderChange);
   modelSelect.addEventListener("change", handleModelChange);
   consentCheckbox.addEventListener("change", refreshActions);
+  workspaceConsentCheckbox.addEventListener("change", refreshActions);
   function renderCurrentJob() {
     if (latestSnapshot === void 0) {
       return;
@@ -1872,6 +2028,8 @@ function createAgentPanel(document, ai, localizer) {
     modelText.textContent = messages.agent.model;
     providerSelect.setAttribute("aria-label", messages.agent.providerAriaLabel);
     modelSelect.setAttribute("aria-label", messages.agent.modelAriaLabel);
+    workspaceConsentTitle.textContent = messages.agent.includeLocalChanges;
+    workspaceConsentHelp.textContent = messages.agent.includeLocalChangesHelp;
     diff.setAttribute("aria-label", messages.agent.diffAriaLabel);
     testButton.textContent = messages.agent.testConnection;
     applyButton.textContent = messages.agent.apply;
@@ -1892,6 +2050,7 @@ function createAgentPanel(document, ai, localizer) {
     } else {
       capability.textContent = latestCapabilityMessage;
     }
+    renderWorkspaceMessage();
     refreshActions();
     renderCurrentJob();
   }
@@ -1902,6 +2061,7 @@ function createAgentPanel(document, ai, localizer) {
     providerSelect,
     modelSelect,
     consentCheckbox,
+    workspaceConsentCheckbox,
     testButton,
     runButton,
     cancelButton,
@@ -1911,6 +2071,9 @@ function createAgentPanel(document, ai, localizer) {
     consentGranted() {
       return consentCheckbox.checked;
     },
+    workspaceConsentGranted() {
+      return workspaceConsentCheckbox.checked;
+    },
     readSelection() {
       const provider = selectedProvider();
       const model = provider?.models.find(
@@ -1931,6 +2094,20 @@ function createAgentPanel(document, ai, localizer) {
       capability.textContent = capabilitySnapshot?.state === "agent-ready" ? `${message} \xB7 ${messages.agent.toolsReady}` : message;
       refreshActions();
     },
+    renderWorkspaceHealth(state, snapshot, errorCode) {
+      latestWorkspaceState = state;
+      latestWorkspaceSnapshot = snapshot;
+      latestWorkspaceErrorCode = errorCode ?? snapshot?.errorCode;
+      workspace.dataset.state = state;
+      if (state !== "checking") {
+        workspaceConsent.hidden = state !== "consent-required";
+      }
+      if (state === "idle" || state === "ready" || state === "blocked") {
+        workspaceConsentCheckbox.checked = false;
+      }
+      renderWorkspaceMessage();
+      refreshActions();
+    },
     renderJob(snapshot, result, activities, errorCode) {
       jobPresented = true;
       setup.hidden = true;
@@ -1938,6 +2115,7 @@ function createAgentPanel(document, ai, localizer) {
       providerSelect.disabled = true;
       modelSelect.disabled = true;
       consentCheckbox.disabled = true;
+      workspaceConsentCheckbox.disabled = true;
       latestSnapshot = snapshot;
       latestResult = result;
       latestActivities = activities;
@@ -1955,6 +2133,7 @@ function createAgentPanel(document, ai, localizer) {
       providerSelect.disabled = false;
       modelSelect.disabled = false;
       consentCheckbox.disabled = false;
+      workspaceConsentCheckbox.disabled = false;
       activity.replaceChildren();
       files.replaceChildren();
       checks.replaceChildren();
@@ -1972,6 +2151,7 @@ function createAgentPanel(document, ai, localizer) {
       providerSelect.disabled = !enabled || jobPresented;
       modelSelect.disabled = !enabled || jobPresented;
       consentCheckbox.disabled = !enabled || jobPresented;
+      workspaceConsentCheckbox.disabled = !enabled || jobPresented;
       refreshActions();
     },
     setProviderConsent(granted) {
@@ -1993,6 +2173,7 @@ function createAgentPanel(document, ai, localizer) {
       providerSelect.removeEventListener("change", handleProviderChange);
       modelSelect.removeEventListener("change", handleModelChange);
       consentCheckbox.removeEventListener("change", refreshActions);
+      workspaceConsentCheckbox.removeEventListener("change", refreshActions);
     }
   });
 }
@@ -2162,8 +2343,16 @@ var ERROR_MESSAGES_EN = Object.freeze({
   [ERROR_CODES2.AGENT_BUSY]: "Another write Agent job is still active.",
   [ERROR_CODES2.AGENT_LIMIT_EXCEEDED]: "The Agent stopped at a configured time, turn, output, or size limit.",
   [ERROR_CODES2.AGENT_CANCELLED]: "The Agent job was cancelled.",
-  [ERROR_CODES2.WORKTREE_DIRTY]: "Commit or otherwise clean staged, unstaged, and untracked files before running AI.",
+  [ERROR_CODES2.WORKTREE_DIRTY]: "Local changes require explicit inclusion consent before running AI.",
+  [ERROR_CODES2.WORKTREE_NOT_REPOSITORY]: "The Vite root is not the top level of an initialized Git repository.",
+  [ERROR_CODES2.WORKTREE_OPERATION_IN_PROGRESS]: "Finish the active merge, rebase, cherry-pick, or revert before running AI.",
+  [ERROR_CODES2.WORKTREE_CONFLICTED]: "Resolve all merge conflicts before running AI; SpotPatch will not guess a resolution.",
+  [ERROR_CODES2.WORKTREE_LOCAL_CHANGES_TOO_LARGE]: "Local untracked files exceed the safe isolation limit. Reduce their count or total size.",
+  [ERROR_CODES2.WORKTREE_UNTRACKED_UNSUPPORTED]: "An untracked item is missing, linked, or not a regular file and cannot be isolated safely.",
+  [ERROR_CODES2.WORKTREE_LOCAL_CHANGES_UNSUPPORTED]: "Local changes include conflicts, unsupported files, or exceed the safe baseline limit.",
   [ERROR_CODES2.TOOL_DENIED]: "A model tool request violated the local safety policy.",
+  [ERROR_CODES2.TOOL_INPUT_INVALID]: "The model sent invalid tool arguments or reused a tool call ID inconsistently.",
+  [ERROR_CODES2.TOOL_PATH_DENIED]: "The model tried to access a protected, non-text, linked, or out-of-project path.",
   [ERROR_CODES2.PATCH_REJECTED]: "The proposed patch did not pass local policy.",
   [ERROR_CODES2.VALIDATION_FAILED]: "Required project checks failed. The change cannot be applied.",
   [ERROR_CODES2.APPLY_CONFLICT]: "Project files changed after the Agent baseline; no overwrite was performed.",
@@ -2187,8 +2376,16 @@ var ERROR_MESSAGES_ZH = Object.freeze({
   [ERROR_CODES2.AGENT_BUSY]: "\u5F53\u524D\u9879\u76EE\u5DF2\u6709\u4E00\u4E2A\u5199\u5165\u4EFB\u52A1\u6B63\u5728\u8FD0\u884C\u3002",
   [ERROR_CODES2.AGENT_LIMIT_EXCEEDED]: "Agent \u8FBE\u5230\u65F6\u95F4\u3001\u8F6E\u6B21\u3001\u8F93\u51FA\u6216\u53D8\u66F4\u89C4\u6A21\u9650\u5236\u3002",
   [ERROR_CODES2.AGENT_CANCELLED]: "Agent \u4EFB\u52A1\u5DF2\u53D6\u6D88\u3002",
-  [ERROR_CODES2.WORKTREE_DIRTY]: "\u8FD0\u884C AI \u524D\uFF0C\u8BF7\u5148\u63D0\u4EA4\u6216\u6E05\u7406\u6682\u5B58\u3001\u672A\u6682\u5B58\u4E0E\u672A\u8DDF\u8E2A\u6587\u4EF6\u3002",
+  [ERROR_CODES2.WORKTREE_DIRTY]: "\u8FD0\u884C AI \u524D\uFF0C\u8BF7\u660E\u786E\u540C\u610F\u5C06\u5F53\u524D\u672C\u5730\u4FEE\u6539\u7EB3\u5165\u9694\u79BB\u57FA\u7EBF\u3002",
+  [ERROR_CODES2.WORKTREE_NOT_REPOSITORY]: "Vite \u6839\u76EE\u5F55\u4E0D\u662F\u5DF2\u521D\u59CB\u5316 Git \u4ED3\u5E93\u7684\u9876\u5C42\u76EE\u5F55\u3002",
+  [ERROR_CODES2.WORKTREE_OPERATION_IN_PROGRESS]: "\u8BF7\u5148\u5B8C\u6210\u5F53\u524D merge\u3001rebase\u3001cherry-pick \u6216 revert\uFF0C\u518D\u8FD0\u884C AI\u3002",
+  [ERROR_CODES2.WORKTREE_CONFLICTED]: "\u8BF7\u5148\u89E3\u51B3\u5168\u90E8\u5408\u5E76\u51B2\u7A81\uFF1BSpotPatch \u4E0D\u4F1A\u731C\u6D4B\u51B2\u7A81\u89E3\u51B3\u65B9\u5F0F\u3002",
+  [ERROR_CODES2.WORKTREE_LOCAL_CHANGES_TOO_LARGE]: "\u672C\u5730\u672A\u8DDF\u8E2A\u6587\u4EF6\u8D85\u8FC7\u5B89\u5168\u9694\u79BB\u4E0A\u9650\uFF0C\u8BF7\u51CF\u5C11\u6587\u4EF6\u6570\u91CF\u6216\u603B\u4F53\u79EF\u3002",
+  [ERROR_CODES2.WORKTREE_UNTRACKED_UNSUPPORTED]: "\u67D0\u4E2A\u672A\u8DDF\u8E2A\u9879\u5DF2\u4E22\u5931\u3001\u662F\u7B26\u53F7\u94FE\u63A5\u6216\u4E0D\u662F\u666E\u901A\u6587\u4EF6\uFF0C\u65E0\u6CD5\u5B89\u5168\u9694\u79BB\u3002",
+  [ERROR_CODES2.WORKTREE_LOCAL_CHANGES_UNSUPPORTED]: "\u672C\u5730\u4FEE\u6539\u5B58\u5728\u51B2\u7A81\u3001\u4E0D\u652F\u6301\u7684\u6587\u4EF6\uFF0C\u6216\u8D85\u8FC7\u5B89\u5168\u57FA\u7EBF\u9650\u5236\u3002",
   [ERROR_CODES2.TOOL_DENIED]: "\u6A21\u578B\u5DE5\u5177\u8BF7\u6C42\u8FDD\u53CD\u672C\u5730\u5B89\u5168\u7B56\u7565\u3002",
+  [ERROR_CODES2.TOOL_INPUT_INVALID]: "\u6A21\u578B\u53D1\u9001\u4E86\u65E0\u6548\u5DE5\u5177\u53C2\u6570\uFF0C\u6216\u4E0D\u4E00\u81F4\u5730\u590D\u7528\u4E86\u5DE5\u5177\u8C03\u7528 ID\u3002",
+  [ERROR_CODES2.TOOL_PATH_DENIED]: "\u6A21\u578B\u5C1D\u8BD5\u8BBF\u95EE\u53D7\u4FDD\u62A4\u3001\u975E\u6587\u672C\u3001\u7B26\u53F7\u94FE\u63A5\u6216\u9879\u76EE\u5916\u8DEF\u5F84\u3002",
   [ERROR_CODES2.PATCH_REJECTED]: "\u5EFA\u8BAE\u8865\u4E01\u672A\u901A\u8FC7\u672C\u5730\u7B56\u7565\u68C0\u67E5\u3002",
   [ERROR_CODES2.VALIDATION_FAILED]: "\u9879\u76EE\u5FC5\u9700\u68C0\u67E5\u5931\u8D25\uFF0C\u4E0D\u80FD\u5E94\u7528\u672C\u6B21\u53D8\u66F4\u3002",
   [ERROR_CODES2.APPLY_CONFLICT]: "Agent \u5EFA\u7ACB\u57FA\u7EBF\u540E\u9879\u76EE\u6587\u4EF6\u5DF2\u53D8\u5316\uFF0C\u672A\u6267\u884C\u8986\u76D6\u3002",
@@ -2353,6 +2550,13 @@ var UI_MESSAGES = Object.freeze({
       providerUnavailable: "Provider configuration is unavailable.",
       consent: (provider) => `I understand selected context and allowed source may be sent to ${provider}; its data policy is my responsibility.`,
       connectionNotTested: "Connection not tested",
+      workspaceNotChecked: "Local workspace not checked",
+      checkingWorkspace: "Checking Git workspace and isolated execution\u2026",
+      workspaceReady: "Local workspace is ready for isolated execution",
+      workspaceDirty: (staged, unstaged, untracked) => `Local changes found \xB7 ${String(staged)} staged \xB7 ${String(unstaged)} unstaged \xB7 ${String(untracked)} untracked`,
+      includeLocalChanges: "Allow the Agent to continue from my current local changes",
+      includeLocalChangesHelp: "The Agent may edit these files. SpotPatch preserves the baseline and applies or reverts only the Agent delta.",
+      localChangesConsentRequired: "Confirm inclusion of current local changes before running AI.",
       capabilityVerified: "Agent capability verified",
       capabilityVerifiedAnnouncement: "AI provider capability verified.",
       testingCapability: "Testing authentication, tools, continuation, and streaming\u2026",
@@ -2361,7 +2565,7 @@ var UI_MESSAGES = Object.freeze({
       reverting: "Reverting the applied Agent change.",
       consentRequired: "Confirm remote provider data transmission before running AI.",
       toolsReady: "tools and streaming ready",
-      testConnection: "Test connection",
+      testConnection: "Check environment",
       verifyAndRun: "Verify & run",
       verifying: "Verifying\u2026",
       run: "Run AI",
@@ -2482,6 +2686,13 @@ var UI_MESSAGES = Object.freeze({
       providerUnavailable: "\u6A21\u578B\u670D\u52A1\u914D\u7F6E\u4E0D\u53EF\u7528\u3002",
       consent: (provider) => `\u6211\u4E86\u89E3\u9009\u4E2D\u4E0A\u4E0B\u6587\u4E0E\u83B7\u51C6\u6E90\u7801\u53EF\u80FD\u53D1\u9001\u5230 ${provider}\uFF0C\u5E76\u81EA\u884C\u8D1F\u8D23\u5176\u6570\u636E\u7B56\u7565\u3002`,
       connectionNotTested: "\u5C1A\u672A\u6D4B\u8BD5\u8FDE\u63A5",
+      workspaceNotChecked: "\u5C1A\u672A\u68C0\u67E5\u672C\u5730\u5DE5\u4F5C\u533A",
+      checkingWorkspace: "\u6B63\u5728\u68C0\u67E5 Git \u5DE5\u4F5C\u533A\u4E0E\u9694\u79BB\u6267\u884C\u73AF\u5883\u2026\u2026",
+      workspaceReady: "\u672C\u5730\u5DE5\u4F5C\u533A\u5DF2\u6EE1\u8DB3\u9694\u79BB\u6267\u884C\u6761\u4EF6",
+      workspaceDirty: (staged, unstaged, untracked) => `\u53D1\u73B0\u672C\u5730\u4FEE\u6539 \xB7 \u6682\u5B58 ${String(staged)} \xB7 \u672A\u6682\u5B58 ${String(unstaged)} \xB7 \u672A\u8DDF\u8E2A ${String(untracked)}`,
+      includeLocalChanges: "\u5141\u8BB8 Agent \u57FA\u4E8E\u6211\u5F53\u524D\u7684\u672C\u5730\u4FEE\u6539\u7EE7\u7EED",
+      includeLocalChangesHelp: "Agent \u53EF\u80FD\u7EE7\u7EED\u4FEE\u6539\u8FD9\u4E9B\u6587\u4EF6\uFF1BSpotPatch \u4F1A\u4FDD\u7559\u539F\u57FA\u7EBF\uFF0C\u4EC5\u5E94\u7528\u6216\u64A4\u9500 Agent \u81EA\u5DF1\u7684\u589E\u91CF\u3002",
+      localChangesConsentRequired: "\u8FD0\u884C AI \u524D\uFF0C\u8BF7\u786E\u8BA4\u5141\u8BB8\u7EB3\u5165\u5F53\u524D\u672C\u5730\u4FEE\u6539\u3002",
       capabilityVerified: "Agent \u80FD\u529B\u9A8C\u8BC1\u901A\u8FC7",
       capabilityVerifiedAnnouncement: "AI \u6A21\u578B\u670D\u52A1\u80FD\u529B\u9A8C\u8BC1\u901A\u8FC7\u3002",
       testingCapability: "\u6B63\u5728\u9A8C\u8BC1\u9274\u6743\u3001\u5DE5\u5177\u8C03\u7528\u3001\u8FDE\u7EED\u8C03\u7528\u4E0E\u6D41\u5F0F\u54CD\u5E94\u2026\u2026",
@@ -2490,7 +2701,7 @@ var UI_MESSAGES = Object.freeze({
       reverting: "\u6B63\u5728\u64A4\u9500\u5DF2\u5E94\u7528\u7684 Agent \u53D8\u66F4\u3002",
       consentRequired: "\u8FD0\u884C AI \u524D\uFF0C\u8BF7\u5148\u786E\u8BA4\u5141\u8BB8\u5411\u8FDC\u7A0B\u6A21\u578B\u670D\u52A1\u4F20\u8F93\u6570\u636E\u3002",
       toolsReady: "\u5DE5\u5177\u8C03\u7528\u4E0E\u6D41\u5F0F\u54CD\u5E94\u5DF2\u5C31\u7EEA",
-      testConnection: "\u6D4B\u8BD5\u8FDE\u63A5",
+      testConnection: "\u68C0\u67E5\u8FD0\u884C\u73AF\u5883",
       verifyAndRun: "\u9A8C\u8BC1\u5E76\u8FD0\u884C",
       verifying: "\u9A8C\u8BC1\u4E2D\u2026\u2026",
       run: "\u8FD0\u884C AI",
@@ -3740,6 +3951,7 @@ function createRuntimeView(document, shortcut, ai = Object.freeze({ enabled: fal
     agentProviderSelect: agentPanel.providerSelect,
     agentModelSelect: agentPanel.modelSelect,
     agentConsentCheckbox: agentPanel.consentCheckbox,
+    agentWorkspaceConsentCheckbox: agentPanel.workspaceConsentCheckbox,
     agentTestButton: agentPanel.testButton,
     agentRunButton: agentPanel.runButton,
     agentCancelButton: agentPanel.cancelButton,
@@ -3851,6 +4063,10 @@ function createRuntimeView(document, shortcut, ai = Object.freeze({ enabled: fal
       previewButton.classList.toggle("spotpatch-primary", !agentReady);
       placeDialog();
     },
+    renderAgentWorkspaceHealth(state, snapshot, errorCode) {
+      agentPanel.renderWorkspaceHealth(state, snapshot, errorCode);
+      placeDialog();
+    },
     renderAgentJob(snapshot, result, activities, errorCode) {
       agentPanel.renderJob(snapshot, result, activities, errorCode);
       placeDialog();
@@ -3871,6 +4087,7 @@ function createRuntimeView(document, shortcut, ai = Object.freeze({ enabled: fal
     },
     locale: localizer.locale,
     messages: localizer.messages,
+    agentWorkspaceConsentGranted: agentPanel.workspaceConsentGranted,
     subscribeLocale: localizer.subscribe,
     dispose() {
       diagnostics.removeEventListener("toggle", placeDialog);
@@ -3974,6 +4191,22 @@ function createAgentWorkflow(options) {
   let appliedDuringCurrentJob = false;
   let actionPending = false;
   const selectedProfiles = () => options.view.readAgentSelection();
+  const refreshWorkspaceHealth = async (workflowRevision) => {
+    options.view.renderAgentWorkspaceHealth("checking");
+    try {
+      const health = await options.api.agentWorkspaceHealth();
+      if (workflowRevision !== revision) {
+        return health;
+      }
+      options.view.renderAgentWorkspaceHealth(health.state, health, health.errorCode);
+      return health;
+    } catch (error) {
+      if (workflowRevision === revision) {
+        options.view.renderAgentWorkspaceHealth("blocked", void 0, errorCode(error));
+      }
+      throw error;
+    }
+  };
   const renderJob = (explicitErrorCode) => {
     if (snapshot === void 0) {
       return;
@@ -4149,6 +4382,10 @@ function createAgentWorkflow(options) {
     },
     beginSelection() {
       resetState();
+      const workflowRevision = revision;
+      if (options.ai.enabled) {
+        void refreshWorkspaceHealth(workflowRevision).catch(() => void 0);
+      }
     },
     cancel() {
       if (snapshot?.canCancel === true) {
@@ -4181,12 +4418,17 @@ function createAgentWorkflow(options) {
     providerOrModelChanged() {
       revision += 1;
       restoreProviderState();
+      const workflowRevision = revision;
+      void refreshWorkspaceHealth(workflowRevision).catch(() => void 0);
     },
     reset() {
       const mustReselect = appliedDuringCurrentJob;
       resetState();
       if (mustReselect) {
         options.onReselectRequired();
+      } else if (options.ai.enabled) {
+        const workflowRevision = revision;
+        void refreshWorkspaceHealth(workflowRevision).catch(() => void 0);
       }
     },
     revert() {
@@ -4213,15 +4455,27 @@ function createAgentWorkflow(options) {
       providerConsents.add(selection.providerProfileId);
       const workflowRevision = ++revision;
       options.view.setAgentEditingEnabled(false);
-      void probe(workflowRevision).then(async () => {
+      void Promise.all([
+        probe(workflowRevision),
+        refreshWorkspaceHealth(workflowRevision)
+      ]).then(async ([, health]) => {
         if (workflowRevision !== revision) {
           return;
         }
+        if (health.state === "blocked") {
+          throw new RuntimeApiError(
+            health.errorCode ?? ERROR_CODES3.WORKTREE_LOCAL_CHANGES_UNSUPPORTED
+          );
+        }
+        if (health.state === "consent-required" && !options.view.agentWorkspaceConsentGranted()) {
+          throw new RuntimeApiError(ERROR_CODES3.WORKTREE_DIRTY);
+        }
         const created = await options.api.createAgentJob({
           annotation,
           providerProfileId: selection.providerProfileId,
           modelProfileId: selection.modelProfileId,
-          providerDataConsent: true
+          providerDataConsent: true,
+          workingTreeMode: health.state === "consent-required" ? "include-local-changes" : "require-clean"
         });
         if (workflowRevision !== revision) {
           return;
@@ -4250,7 +4504,10 @@ function createAgentWorkflow(options) {
         return;
       }
       const workflowRevision = ++revision;
-      void probe(workflowRevision).catch((error) => {
+      void Promise.all([
+        probe(workflowRevision),
+        refreshWorkspaceHealth(workflowRevision)
+      ]).catch((error) => {
         if (workflowRevision === revision) {
           options.view.renderAgentCapability(
             "error",