weir-harness 1.2.3 → 2.1.0

package/lib/client.settings-page.js

@@ -47,7 +47,7 @@ window.__ModuleLoader__.load({
 		// scatter). test/client-settings-page.test.js pins this list to
 		// RESTART_KEYS from src/settings/sections.js, so a declaration
 		// change on either side cannot drift the two sides.
-		const RESTART_FIELDS = ["intentGateClassifier", "intentGateProvider", "intentGateModel", "intentGateReasoningEffort", "intentGateTimeoutMs", "jevEndpoint", "jevModel", "jevApiKeyEnv", "todoEnabled", "todoMaxConsecutive", "todoErrorRetryMax", "todoErrorBackoffBaseMs", "todoErrorBackoffCapMs", "hashlineHideStockEdit", "editLockEnabled"];
+		const RESTART_FIELDS = ["intentGateClassifier", "intentGateProvider", "intentGateModel", "intentGateReasoningEffort", "intentGateTimeoutMs", "jevEndpoint", "jevModel", "jevApiKeyEnv", "todoEnabled", "todoMaxConsecutive", "todoErrorRetryMax", "todoErrorBackoffBaseMs", "todoErrorBackoffCapMs", "hashlineHideStockEdit"];
 		// ---- condition declaration shorthands (frozen pure data, D2) ----
 		const enabledWhen = (key) => Object.freeze({ key, equals: true });
 		const CLASSIFIER_LLM = Object.freeze({ key: "intentGateClassifier", equals: "llm" });
@@ -107,10 +107,8 @@ window.__ModuleLoader__.load({
 			] },
 			{ id: "editing", fields: [
 				{ field: "hashlineHideStockEdit", kind: "boolean" },
-				{ field: "editLockEnabled", kind: "boolean" },
-				{ field: "editLockAutoResume", kind: "boolean", parent: "editLockEnabled", when: enabledWhen("editLockEnabled") },
-				{ field: "editLockStaleSweep", kind: "boolean", parent: "editLockEnabled", when: enabledWhen("editLockEnabled") },
-				// Diagnostics must remain reachable when enforcement is off.
+				// Edit Lock diagnostics seat: the composition root binds no editor
+				// for it (edit-lock rebuild), so the row renders nothing.
 				{ kind: "custom", slot: "editLockMaintenance" }
 			] },
 			{ id: "worktree", fields: [
@@ -194,14 +192,6 @@ window.__ModuleLoader__.load({
 			guardSoftThreshold: 0.72,
 			guardHardThreshold: 0.88,
 			hashlineHideStockEdit: true,
-			editLockEnabled: true,
-			editLockHoldDefaultMinutes: 30,
-			editLockHoldSingleMaxMinutes: 30,
-			editLockHoldCumulativeMaxMinutes: 120,
-			editLockNudgeAttempts: 2,
-			editLockNudgeFallback: "release",
-			editLockAutoResume: true,
-			editLockStaleSweep: true,
 			robashEnabled: true,
 			lspEnabled: false,
 			lspIdleMs: 600000,
@@ -597,7 +587,6 @@ window.__ModuleLoader__.load({
 		const childLabelStyle = { ...labelStyle, fontSize: "13px" };
 		const labelTextStyle = { display: "inline-flex", alignItems: "center", gap: "6px" };
 		const hintStyle = { fontSize: "12px", lineHeight: "16px", color: "var(--dsw-alias-label-secondary)" };
-		const optOutStyle = { ...hintStyle, color: "var(--dsw-alias-state-warn-primary)", borderLeft: "2px solid var(--dsw-alias-state-warn-primary)", paddingLeft: "8px", marginTop: "4px" };
 		// Card-based group sections (design D7): layered background, l1 border,
 		// radius, the group title inside the card top, hairline l2 separators
 		// between rows. Colors only from theme tokens; geometry hardcoded.
@@ -637,9 +626,6 @@ window.__ModuleLoader__.load({
 				react_jsx_runtime.jsxs("div", { style: labelGroupStyle, children: [
 					labelWithTag(descriptor, t, depth > 0 ? childLabelStyle : labelStyle),
 					react_jsx_runtime.jsx("span", { style: hintStyle, children: t(`${descriptor.field}Hint`) }),
-					descriptor.field === "editLockEnabled" && resolveEffectiveValue(descriptor, field, field?.saved) !== true
-						? react_jsx_runtime.jsx("span", { style: optOutStyle, role: "alert", children: t("editLockOptOutWarning") })
-						: null
 				] }),
 				react_jsx_runtime.jsxs("div", { style: { display: "flex", flexDirection: "column", alignItems: "flex-end", gap: "4px" }, children: [
 					descriptor.kind === "boolean" ? react_jsx_runtime.jsx(primitives.Switch, {
@@ -925,9 +911,13 @@ window.__ModuleLoader__.load({
 						}));
 					}
 					if (node.slot === "editLockMaintenance") {
-						// Edit Lock maintenance: profile-wide switch status and
-						// read-only authority diagnostics (read-only).
-						return wrap(react_jsx_runtime.jsx(props.editors.EditLockMaintenanceField, { t }));
+						// The Edit Lock maintenance seat is GONE (edit-lock rebuild):
+						// the composition root no longer binds an editor for it, and
+						// the row disappears with the settings keys. An unbound seat
+						// must leave the card intact instead of rendering an undefined
+						// element type, so the row simply renders nothing here.
+						const MaintenanceField = props.editors?.EditLockMaintenanceField;
+						return typeof MaintenanceField === "function" ? wrap(react_jsx_runtime.jsx(MaintenanceField, { t })) : null;
 					}
 					// notifyPermissions: the macOS-only permission entry
 					return wrap(react_jsx_runtime.jsx(props.editors.NotifyPermissionsField, { t }));
@@ -1113,13 +1103,6 @@ window.__ModuleLoader__.load({
 				guardHardThresholdHint: "Above this fill ratio compaction is requested (default 0.88; not a completion guarantee).",
 				hashlineHideStockEdit: "Anchor editing only",
 				hashlineHideStockEditHint: "Hides the built-in edit tool; file edits go through hash_edit anchors only.",
-				editLockEnabled: "Edit Lock",
-				editLockEnabledHint: "Sessions take turns editing the same files instead of overwriting each other.",
-				editLockOptOutWarning: "Edit Lock is set to off. After saving, restart DeepSeek Harness to apply the change. Once enforcement is off, ordinary editing is UNPROTECTED and can overwrite another session's work. Old fences and history are retained and may block files when you re-enable Edit Lock.",
-				editLockAutoResume: "Message resumes editing",
-				editLockAutoResumeHint: "After a session is stopped, sending any message restores its editing right and re-confirms its kept files (default on).",
-				editLockStaleSweep: "Sweep stale locks",
-				editLockStaleSweepHint: "Locks whose target file was deleted or moved are re-verified and released as you send messages (default on).",
 				worktreeEnabled: "Worktree lanes",
 				worktreeEnabledHint: "Lets the assistant work in isolated git worktrees: lane tools, the /worktree command, and the lanes panel.",
 				worktreeAutoSetup: "Auto-install in new lanes",
@@ -1248,13 +1231,6 @@ window.__ModuleLoader__.load({
 				guardHardThresholdHint: "上下文用量超过该比例时请求立即压缩（默认 0.88，不保证压缩完成）。",
 				hashlineHideStockEdit: "仅用锚点编辑",
 				hashlineHideStockEditHint: "隐藏内置 edit 工具，文件修改一律走 hash_edit 锚点编辑。",
-				editLockEnabled: "编辑锁",
-				editLockEnabledHint: "多个会话轮流编辑同一批文件，而不是互相覆盖。",
-				editLockOptOutWarning: "编辑锁已设为关闭。保存后须重启 DeepSeek Harness 才会生效。停用强制执行后，普通编辑不受保护，可能覆盖其他会话的工作。旧围栏与历史仍会保留，重新启用编辑锁时可能再次阻塞文件。",
-				editLockAutoResume: "发消息即恢复编辑",
-				editLockAutoResumeHint: "会话被停止后，发送任意消息即自动恢复其编辑权并确认保留的文件（默认开启）。",
-				editLockStaleSweep: "自动清理失效锁",
-				editLockStaleSweepHint: "目标文件已被删除或移动的锁，在你发消息时自动复核并释放（默认开启）。",
 				worktreeEnabled: "Worktree 车道",
 				worktreeEnabledHint: "让助手在隔离的 git worktree 中工作：车道工具、/worktree 命令与车道面板。",
 				worktreeAutoSetup: "新车道自动安装依赖",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weir-harness",
-  "version": "1.2.3",
+  "version": "2.1.0",
   "type": "module",
   "description": "Weir \u2014 orchestrator-centric DSH agent preset: intent gate, category delegation, todo driver, pull-based background jobs, auto-compaction, hashline edit.",
   "license": "MIT",
@@ -43,7 +43,7 @@
     "./todo-driver": "./src/todo-driver/index.js",
     "./context-guard": "./src/context-guard/index.js",
     "./hashline-edit": "./src/hashline-edit/index.js",
-    "./edit-lock": "./src/edit-lock/index.js",
+    "./file-lease": "./src/file-lease/plugin.js",
     "./blackboard": "./src/blackboard/index.js",
     "./blackboard-remote": "./src/blackboard/remote.js",
     "./worktree": "./src/worktree/index.js",

package/skills/mcp-server-setup/SKILL.md

@@ -0,0 +1,124 @@
+---
+name: mcp-server-setup
+description: "Install, add, or configure a new MCP server with credential-safe preview, exact Host confirmation, strict discovery, and separate session Apply. Do not use for merely calling or discussing an existing MCP tool."
+metadata:
+  short-description: Credential-safe MCP server installation
+---
+
+# MCP Server Setup
+
+Use this workflow for genuine requests to install, add, or configure a new MCP
+server. It is not a tool-repair or general MCP discussion workflow.
+
+## Boundaries
+
+- Weir supports `stdio` and `streamable-http` only. Do not propose legacy SSE,
+  OAuth flows, a marketplace, or adoption of an unmanaged server.
+- Never ask the user to paste a token, password, private endpoint, or other
+  secret into chat. Use an existing DSH credential reference such as
+  `{ "ref": "GITHUB_TOKEN" }`. A reference may include a non-secret `prefix`.
+- Every environment or HTTP-header value on this tool surface is a credential
+  reference. Mark each sensitive stdio argument with a reference object instead
+  of placing its value in a plain argument string.
+- Any URL containing userinfo, a query, or a fragment is sensitive. Supply the
+  whole URL through a credential reference; do not put it in the plan.
+- Installation never selects the server, changes a default, or Applies a
+  capability set. Do not imply that a mounted server is already authorized.
+
+## 1. Establish the plan
+
+Read the server author's current documentation when it is available. Identify
+the transport, executable or endpoint, non-secret arguments, required credential
+references, working directory, and relevant timeout/reconnect options. Keep the
+plan within the `mcp_install` schema. Unknown fields and cross-transport fields
+are rejected.
+
+For stdio, `command` and non-secret `args` describe the process. For
+`streamable-http`, use `url` and credential-referenced `headers`; stdio fields
+are forbidden. `failOnStartupError` is not configurable: initial mounting is
+always strict. Discovering zero tools is still a valid result.
+
+Example stdio plan shape (references, not secrets):
+
+```json
+{
+  "action": "preview",
+  "plan": {
+    "identity": "github",
+    "label": "GitHub",
+    "transport": "stdio",
+    "command": "npx",
+    "args": ["-y", "@example/mcp-server", { "ref": "MCP_CLI_TOKEN" }],
+    "env": { "GITHUB_TOKEN": { "ref": "GITHUB_TOKEN" } }
+  }
+}
+```
+
+Example HTTP plan shape:
+
+```json
+{
+  "action": "preview",
+  "plan": {
+    "identity": "private-docs",
+    "transport": "streamable-http",
+    "url": { "ref": "PRIVATE_MCP_URL" },
+    "headers": {
+      "Authorization": { "ref": "PRIVATE_MCP_TOKEN", "prefix": "Bearer " }
+    }
+  }
+}
+```
+
+## 2. Preview before installation
+
+Call `mcp_install` with `action: "preview"` and the plan. Check the bounded
+redacted plan, digest, target conflicts, namespace conflicts, capabilities, and
+validation outcome. Preview does not start a process, contact the server, write
+credentials or configuration, or change selection. Correct the plan and preview
+again when necessary.
+
+`mcp_install` is single-server and fresh-identity only. Do not use it to edit,
+restart, remove, batch-import, or set a default. Use the management UI or the
+shared `/capabilities` MCP commands for those operations.
+
+## 3. Let the Host obtain approval
+
+After a clean preview, call `mcp_install` with `action: "install"` and the same
+plan. The Host displays the exact redacted plan, its digest, and process or
+network effects. Only the user can approve that card. There is no `confirmed`
+argument; chat text, custom answers, and extra selections are not approval.
+
+Cancellation, close, timeout, missing confirmation support, delegated callers,
+ownership changes, plan changes, registry changes, and namespace changes stop
+before probe or write. Report the outcome and request a fresh preview when
+required; never fabricate approval or retry an unchanged conflict in a loop.
+
+## 4. Interpret the actual outcome
+
+An approved install probes before registration. A failed probe does not create
+a registry entry. A mounted result reports the real identity, incarnation,
+generation, and bounded discovery summary.
+
+- `mounted`: registration and strict mount succeeded.
+- `saved-degraded`: configuration was saved (`saved: true`) but strict mounting
+  failed. This is not installation success; offer Edit, Test, or Restart.
+- `owner-changed` or `indeterminate`: inspect actual registry/mount facts. Never
+  claim rollback or zero effects.
+- `cleanup-failed` / `cleanup-unknown`: follow the recovery action; do not start
+  an immediate same-name replacement.
+
+Do not run an arbitrary discovered tool as an installation test. Discovery and
+the reported mount outcome are the evidence.
+
+## 5. Keep authorization separate
+
+After a mounted result, direct the user to the separate **Select for this
+session** action and explicit **Apply**. Installation and the optional
+new-session default are independent of the current draft and accepted sets.
+Editing or restarting preserves the registration incarnation; removing and
+re-adding the same identity creates a new one and requires reauthorization.
+
+Credential rotation takes effect on the next explicit probe or restart, not as
+a claimed live reconnect. Local credential storage avoids registry/profile and
+transcript disclosure; it is not an isolation boundary against a same-UID agent.

package/src/capabilities/apply-engine.js

@@ -203,7 +203,7 @@ export function digestApplyRequest(normalized) {
  */
 export function createApplyEngine(options) {
   const {
-    store, locateSession, inventory, provider,
+    store, locateSession, inventory, provider, mcpRegistry,
     fence = createAdmissionFence(),
     drain = createDrainCoordinator(),
     conditions = () => [],
@@ -365,6 +365,19 @@ export function createApplyEngine(options) {
     const missing = normalized.skills.filter(key => (byKey.get(key) ?? []).length !== 1)
     if (missing.length) return { status: 'rejected', reason: 'selected-identity-missing', step: 2, missing }
 
+    let mcpIncarnations
+    if (mcpRegistry) {
+      let current
+      try { current = await mcpRegistry.read() } catch (error) {
+        return { status: 'rejected', reason: `mcp-registry-unavailable:${message(error)}`, step: 2 }
+      }
+      if (current.kind !== 'ok' && current.kind !== 'absent') return { status: 'rejected', reason: `mcp-registry-unavailable:${current.kind}`, step: 2 }
+      const servers = current.kind === 'ok' ? current.servers : {}
+      const missingMcp = normalized.mcpServers.filter(identity => !servers[identity])
+      if (missingMcp.length) return { status: 'rejected', reason: 'unregistered-mcp', step: 2, missing: missingMcp }
+      mcpIncarnations = Object.fromEntries(normalized.mcpServers.map(identity => [identity, servers[identity].incarnation ?? null]))
+    }
+
     // Step 3: prepare a pure snapshot, filtered view and verified content
     // handles. Nothing is published, installed or notified here.
     let prepared
@@ -388,7 +401,7 @@ export function createApplyEngine(options) {
 
     const previousSets = record.kind === 'ok' ? safeSets(record.payload) : { skills: [], mcpServers: [] }
     const removedServers = previousSets.mcpServers.filter(server => !normalized.mcpServers.includes(server))
-    const payload = { skills: prepared.identities, mcpServers: normalized.mcpServers, origin: 'apply' }
+    const payload = { skills: prepared.identities, mcpServers: normalized.mcpServers, ...(mcpIncarnations ? { mcpIncarnations } : {}), origin: 'apply' }
     const requestDigest = digestApplyRequest(normalized)
 
     // Step 4: enter the admission fence, close removed-server gates, start draining.
@@ -496,7 +509,7 @@ export function createApplyEngine(options) {
         status: 'applied',
         revision: result.revision,
         receipt: result.receipt,
-        effective: { skills: structuredClone(prepared.identities), mcpServers: [...normalized.mcpServers] },
+        effective: { skills: structuredClone(prepared.identities), mcpServers: [...normalized.mcpServers], ...(mcpIncarnations ? { mcpIncarnations } : {}) },
         unresolvedWarnings: normalized.unresolved.map(entry => ({ ...entry })),
         ...(draining.length ? { draining } : {}),
         ...(warnings.length ? { warnings } : {}),
@@ -564,6 +577,7 @@ export function createApplyEngine(options) {
     return {
       skills: Array.isArray(value.skills) ? value.skills : [],
       mcpServers: Array.isArray(value.mcpServers) ? /** @type {string[]} */ (value.mcpServers) : [],
+      ...(value.mcpIncarnations && typeof value.mcpIncarnations === 'object' && !Array.isArray(value.mcpIncarnations) ? { mcpIncarnations: structuredClone(value.mcpIncarnations) } : {}),
     }
   }
 
@@ -613,7 +627,7 @@ export function createApplyEngine(options) {
     // just-committed record — reported, never fatal.
     try {
       const sets = safeSets(payload)
-      publishSnapshot?.(sessionId, { revision, skills: structuredClone(sets.skills), mcpServers: [...sets.mcpServers] })
+      publishSnapshot?.(sessionId, { revision, skills: structuredClone(sets.skills), mcpServers: [...sets.mcpServers], ...(sets.mcpIncarnations ? { mcpIncarnations: structuredClone(sets.mcpIncarnations) } : {}) })
     } catch (error) {
       degraded('snapshot-publication-degraded', error)
     }