skill-creator 2.4.0 → 2.5.0

package/dist/daemon.js

@@ -39075,6 +39075,47 @@ var AgentFilesPreviewResultSchema = z10.discriminatedUnion("kind", [
     size: z10.number().int().nonnegative()
   })
 ]);
+var UnifiedProposalViewSchema = z10.strictObject({
+  /** `mcp:<原proposalId>` | `si:<pr_ id>`——路由键。 */
+  id: z10.string().min(1),
+  source: z10.enum(["mcp", "skill-intelligence"]),
+  /** mcp: 原 capability 名（wiki.distill_apply 过滤等消费方依赖）；si: null。 */
+  capability: z10.string().nullable(),
+  /** 底层载荷（mcp: proposal input；si: 草稿 payload）——审批 UI 的展开面。 */
+  payload: z10.unknown().optional(),
+  origin: z10.literal("agent-tool"),
+  /** si: edit/disable/split/merge；mcp: capability slug（dots→dashes，如 wiki-append）。 */
+  kind: z10.string().min(1),
+  /** 主目标（无技能目标的 capability 面 → null）。 */
+  target: z10.strictObject({
+    workspaceId: WorkspaceIdSchema,
+    providerId: ProviderIdSchema,
+    skillId: SkillIdSchema
+  }).nullable(),
+  /** split/merge 多源（与 observedRevisions 对齐）。 */
+  targets: z10.array(
+    z10.strictObject({
+      workspaceId: WorkspaceIdSchema,
+      providerId: ProviderIdSchema,
+      skillId: SkillIdSchema
+    })
+  ).optional(),
+  observedRevision: z10.string().nullable(),
+  observedRevisions: z10.array(z10.string()).optional(),
+  before: z10.string().nullable(),
+  after: z10.string().nullable(),
+  finding: z10.strictObject({ id: z10.string().min(1), summary: z10.string() }).nullable(),
+  validation: z10.strictObject({
+    success: z10.boolean(),
+    errors: z10.array(z10.string()),
+    warnings: z10.array(z10.string())
+  }).nullable(),
+  status: z10.enum(["pending", "approved", "rejected", "executed", "failed"]),
+  rejectCause: z10.enum(["user", "stale"]).optional(),
+  result: z10.strictObject({ applied: z10.boolean(), error: z10.string().optional() }).optional(),
+  createdAt: z10.string().min(1),
+  decidedAt: z10.string().optional()
+});
 
 // src/shared/contracts/agent-steward.ts
 import { z as z12 } from "zod";
@@ -40850,8 +40891,6 @@ var rpcContract = oc.errors(RpcErrorDefinitions).router({
   skillIntelligence: {
     /** Read-only multi-skill analysis locked to observed revisions. */
     analyze: oc.input(AnalyzeInputSchema).output(AnalyzeResultSchema),
-    /** Store a Manager-owned proposal draft; never mutates Providers. */
-    propose: oc.input(ProposeInputSchema).output(ProposeResultSchema),
     /** List pending proposal drafts (newest first). */
     list: oc.input(z20.object({})).output(ListProposalsResultSchema),
     /** Delete one proposal draft. */
@@ -40898,9 +40937,9 @@ var rpcContract = oc.errors(RpcErrorDefinitions).router({
     },
     /** MCP mutation proposal 审批链（task 4.4；Manager authority 的决定面）。 */
     proposals: {
-      list: oc.input(z20.object({})).output(z20.object({ proposals: z20.array(AgentMcpProposalViewSchema) })),
-      approve: oc.input(AgentProposalDecisionInputSchema).output(z20.object({ proposal: AgentMcpProposalViewSchema })),
-      reject: oc.input(AgentProposalDecisionInputSchema).output(z20.object({ proposal: AgentMcpProposalViewSchema }))
+      list: oc.input(z20.object({})).output(z20.object({ proposals: z20.array(UnifiedProposalViewSchema) })),
+      approve: oc.input(AgentProposalDecisionInputSchema).output(z20.object({ proposal: UnifiedProposalViewSchema })),
+      reject: oc.input(AgentProposalDecisionInputSchema).output(z20.object({ proposal: UnifiedProposalViewSchema }))
     },
     /** 面板会话：内核 agent 会话的生命周期投影（task 2.2；旧 dsh.* 收敛并入）。 */
     sessions: {
@@ -73301,9 +73340,78 @@ function createDomainCapabilities(domain) {
       input: DistillApplyInputSchema,
       // N：enqueue 并等待队列任务终态——不走 invoke 的 ok 包装（结果即闭合 result）。
       handler: (input) => domain.wikiDistill.apply(input)
-    }
+    },
+    // intelligence-proposal-parity（工作计划 Ch4 / C′1）：四动作 proposal 一律经
+    // agent tool call 产生——kernel 工具行与 MCP 同名注册（authority=proposal，
+    // 名字本身即 propose 语义，无 mutation 变体后缀）。WebUI 直连创建路径退役。
+    ...[
+      ["edit", EditProposalPayloadSchema],
+      ["disable", DisableProposalPayloadSchema]
+    ].map(([action, payloadSchema]) => ({
+      name: `intelligence_propose_${action}`,
+      description: `Draft an ${action} proposal for the skill addressed in the finding (agent-originated; approval happens in the Skill Creator UI).`,
+      authority: "proposal",
+      input: IntelligenceProposeSingleInputSchema(action, payloadSchema),
+      handler: (input) => invoke(async () => {
+        const parsed = IntelligenceProposeSingleInputSchema(action, payloadSchema).parse(input);
+        const { proposal } = await domain.skillIntelligence.propose({
+          payload: parsed.payload,
+          findingIds: [parsed.findingId],
+          rationale: parsed.rationale
+        });
+        return { proposalId: proposal.id, observedRevisions: proposal.observedRevisions };
+      })
+    })),
+    ...["split", "merge"].map((action) => ({
+      name: `intelligence_propose_${action}`,
+      description: `Draft a ${action} proposal across the addressed skills (agent-originated; multi-source revisions are validated against the payload).`,
+      authority: "proposal",
+      input: IntelligenceProposeMultiInputSchema,
+      handler: (input) => invoke(async () => {
+        const parsed = IntelligenceProposeMultiInputSchema.parse(input);
+        if (parsed.action !== action) {
+          throw new DomainError(
+            "INVALID_OPERATION",
+            `payload kind ${action} required for this tool`
+          );
+        }
+        const { proposal } = await domain.skillIntelligence.propose({
+          payload: parsed.payload,
+          findingIds: [parsed.findingId],
+          rationale: parsed.rationale
+        });
+        return { proposalId: proposal.id, observedRevisions: proposal.observedRevisions };
+      })
+    }))
   ];
 }
+function IntelligenceProposeSingleInputSchema(action, payloadSchema) {
+  return z44.strictObject({
+    action: z44.literal(action),
+    findingId: FindingIdSchema,
+    observedRevision: z44.string().min(1),
+    rationale: z44.string().min(1),
+    payload: payloadSchema
+  });
+}
+var IntelligenceProposeMultiInputSchema = z44.discriminatedUnion("action", [
+  z44.strictObject({
+    action: z44.literal("split"),
+    findingId: FindingIdSchema,
+    targets: z44.array(SkillSelectionSchema).min(1),
+    observedRevisions: z44.array(z44.string().min(1)).min(1),
+    rationale: z44.string().min(1),
+    payload: SplitProposalPayloadSchema
+  }),
+  z44.strictObject({
+    action: z44.literal("merge"),
+    findingId: FindingIdSchema,
+    targets: z44.array(SkillSelectionSchema).min(1),
+    observedRevisions: z44.array(z44.string().min(1)).min(1),
+    rationale: z44.string().min(1),
+    payload: MergeProposalPayloadSchema
+  })
+]);
 
 // src/daemon/mcp/cards.ts
 function escapeHtml(value) {
@@ -74808,6 +74916,83 @@ import { WebSocketServer } from "ws";
 // src/daemon/rpc-router.ts
 import { implement, ORPCError } from "@orpc/server";
 
+// src/daemon/agent-proposals-projection.ts
+function capabilityKind(capability) {
+  return capability.replaceAll(/[._]/g, "-");
+}
+function projectMcpProposal(view) {
+  return {
+    id: `mcp:${view.proposalId}`,
+    source: "mcp",
+    origin: "agent-tool",
+    capability: view.capability,
+    payload: view.input,
+    kind: capabilityKind(view.capability),
+    target: null,
+    observedRevision: null,
+    before: null,
+    after: null,
+    finding: null,
+    validation: null,
+    status: view.status,
+    ...view.rejectedCause !== void 0 ? { rejectCause: "user" } : {},
+    ...view.result !== void 0 ? {
+      result: {
+        applied: view.result.kind === "ok",
+        ...view.result.kind === "failed" ? { error: view.result.message || "capability failed" } : {}
+      }
+    } : {},
+    createdAt: view.createdAt,
+    ...view.decidedAt !== void 0 ? { decidedAt: view.decidedAt } : {}
+  };
+}
+function projectIntelligenceDraft(draft) {
+  const selections = selectionsOf(draft);
+  const primary = selections[0] ?? null;
+  return {
+    id: `si:${draft.id}`,
+    source: "skill-intelligence",
+    origin: "agent-tool",
+    capability: null,
+    payload: draft.payload,
+    kind: draft.payload.kind,
+    target: primary ? {
+      workspaceId: primary.workspaceId,
+      providerId: primary.providerId,
+      skillId: primary.skillId
+    } : null,
+    ...selections.length > 1 ? {
+      targets: selections.map((selection) => ({
+        workspaceId: selection.workspaceId,
+        providerId: selection.providerId,
+        skillId: selection.skillId
+      }))
+    } : {},
+    observedRevision: draft.observedRevisions[0]?.revision ?? null,
+    ...draft.observedRevisions.length > 1 ? { observedRevisions: draft.observedRevisions.map((entry) => entry.revision) } : {},
+    before: null,
+    after: null,
+    finding: draft.findingIds.length > 0 ? { id: draft.findingIds[0], summary: draft.rationale.slice(0, 200) } : null,
+    validation: null,
+    status: "pending",
+    createdAt: draft.createdAt
+  };
+}
+function selectionsOf(draft) {
+  return draft.observedRevisions.map((entry) => ({
+    workspaceId: entry.workspaceId,
+    providerId: entry.providerId,
+    skillId: entry.skillId
+  }));
+}
+function parseUnifiedProposalRef(id) {
+  if (id.startsWith("mcp:")) return { source: "mcp", id: id.slice(4) };
+  if (id.startsWith("si:")) return { source: "skill-intelligence", id: id.slice(3) };
+  throw new Error(
+    `INVALID_OPERATION: unified proposal id must carry an mcp:|si: prefix (got ${id})`
+  );
+}
+
 // src/daemon/self-skill.ts
 import { createHash as createHash19 } from "node:crypto";
 import fs42 from "node:fs";
@@ -75297,9 +75482,8 @@ function createRpcRouter(deps) {
       analyze: rpc.skillIntelligence.analyze.handler(
         async ({ input }) => domain.skillIntelligence.analyze(input)
       ),
-      propose: rpc.skillIntelligence.propose.handler(
-        async ({ input }) => domain.skillIntelligence.propose(input)
-      ),
+      // propose 直连面已退役（intelligence-proposal-parity）：创建向量唯一 =
+      // agent 会话中的 intelligence_propose_* 工具调用（capability 投影）。
       list: rpc.skillIntelligence.list.handler(() => domain.skillIntelligence.list()),
       reject: rpc.skillIntelligence.reject.handler(
         async ({ input }) => domain.skillIntelligence.reject(input.proposalId)
@@ -75351,19 +75535,76 @@ function createRpcRouter(deps) {
         }))
       },
       proposals: {
+        // intelligence-proposal-parity C′2：统一审批入口——mcp:|si: 双源合并投影；
+        // approve/reject 按前缀路由（McpProposalStore / skillIntelligence 服务）。
         list: rpc.agent.proposals.list.handler(() => ({
-          proposals: domain.mcpProposals.list()
-        })),
-        approve: rpc.agent.proposals.approve.handler(async ({ input }) => ({
-          proposal: (await domain.mcpProposals.approve(input.proposalId)).view
+          proposals: [
+            ...domain.mcpProposals.list().map(projectMcpProposal),
+            ...domain.skillIntelligence.list().proposals.map(projectIntelligenceDraft)
+          ]
         })),
+        approve: rpc.agent.proposals.approve.handler(async ({ input }) => {
+          const ref = parseUnifiedProposalRef(input.proposalId);
+          if (ref.source === "mcp") {
+            const result3 = await domain.mcpProposals.approve(ref.id);
+            return { proposal: projectMcpProposal(result3.view) };
+          }
+          const result2 = await domain.skillIntelligence.approve({ proposalId: ref.id });
+          const draft = domain.skillIntelligence.list().proposals.find((entry) => entry.id === ref.id);
+          const base = draft !== void 0 ? projectIntelligenceDraft(draft) : null;
+          const failedEntry = result2.results.find((entry) => entry.status === "failed");
+          return {
+            proposal: base === null || result2.applied > 0 ? {
+              ...base ?? {
+                id: input.proposalId,
+                source: "skill-intelligence",
+                origin: "agent-tool",
+                capability: null,
+                kind: "unknown",
+                target: null,
+                observedRevision: null,
+                before: null,
+                after: null,
+                finding: null,
+                validation: null,
+                createdAt: (/* @__PURE__ */ new Date()).toISOString()
+              },
+              status: failedEntry || result2.failed > 0 ? "failed" : "executed",
+              result: {
+                applied: result2.applied > 0,
+                ...failedEntry?.error !== void 0 ? { error: failedEntry.error } : {}
+              }
+            } : {
+              ...base,
+              validation: {
+                success: false,
+                errors: ["revision stale \u2014 refresh and re-propose"],
+                warnings: []
+              }
+            }
+          };
+        }),
         // reject 变 await 语义（N/U）：late reject → typed PROPOSAL_STALE（data =
         // CapabilityFailureDetail.currentView）；ledger 迁移 IO 失败 → DISTILL_IO。
         reject: rpc.agent.proposals.reject.handler(async ({ input }) => {
-          const rejected = await domain.mcpProposals.reject(input.proposalId);
-          if (!rejected)
-            throw new DomainError("NOT_FOUND", `proposal not found: ${input.proposalId}`);
-          return { proposal: rejected.view };
+          const ref = parseUnifiedProposalRef(input.proposalId);
+          if (ref.source === "mcp") {
+            const rejected = await domain.mcpProposals.reject(ref.id);
+            if (!rejected) throw new DomainError("NOT_FOUND", `proposal not found: ${ref.id}`);
+            return { proposal: projectMcpProposal(rejected.view) };
+          }
+          const drafts = domain.skillIntelligence.list().proposals;
+          const draft = drafts.find((entry) => entry.id === ref.id);
+          if (draft === void 0)
+            throw new DomainError("NOT_FOUND", `proposal not found: ${ref.id}`);
+          domain.skillIntelligence.reject(ref.id);
+          return {
+            proposal: {
+              ...projectIntelligenceDraft(draft),
+              status: "rejected",
+              rejectCause: "user"
+            }
+          };
         })
       },
       sessions: {
@@ -76034,7 +76275,8 @@ function createSkillCreatorMcpServer(deps) {
             type: "text",
             text: safeJson({
               kind: "proposed",
-              proposalId: view.proposalId,
+              // C′2：统一审批路由键（agent.proposals.approve 按 mcp: 前缀分发）。
+              proposalId: `mcp:${view.proposalId}`,
               capability: view.capability,
               status: view.status,
               note: "Awaiting human approval in the Skill Creator UI."
@@ -76267,7 +76509,7 @@ async function mountWebTray(opts) {
     const appIcon = resolveAppIcon(opts.webuiDir);
     const icon = iconPath ? {
       "darwin-icon-only": { type: "file", path: iconPath, isTemplate: true },
-      "win32-icon-only": { type: "file", path: iconPath },
+      "win32-icon-only": { type: "file", path: iconPath, isTemplate: true },
       "linux-icon-only": { type: "file", path: iconPath }
     } : void 0;
     const trayOptions = {
@@ -76335,9 +76577,10 @@ async function mountWindowedTray(opts) {
     const appIcon = resolveAppIcon(opts.webuiDir);
     const windowIcon = resolveWindowIcon(opts.webuiDir);
     const icon = iconPath ? {
-      // macOS template icon：透明背景单色图，系统按深浅色自适应反相。
+      // macOS template icon：透明背景单色图，系统按深浅色自适应反相；
+      // win32 同一张单色图声明 isTemplate，由 daemon 侧按任务栏主题着色。
       "darwin-icon-only": { type: "file", path: iconPath, isTemplate: true },
-      "win32-icon-only": { type: "file", path: iconPath },
+      "win32-icon-only": { type: "file", path: iconPath, isTemplate: true },
       "linux-icon-only": { type: "file", path: iconPath }
     } : void 0;
     const trayOptions = {
@@ -76370,6 +76613,10 @@ async function mountWindowedTray(opts) {
       // 系统绘制 caption 按钮并投影 titlebar-area 几何（macOS NSWindow overlay /
       // win32 AppWindow ExtendsContentIntoTitlebar）。frameless 保持 false——
       // 边框/阴影/resize 与 caption 所有权仍归系统（§2 约束 7）。
+      // 2026-10-01 win32 带区输入回流：opentray 清除了 udk 默认整条 caption 命中
+      // （SetDragRects 退化 rect），带区点击直达页面；区域行为（拖拽 + 双击最大化/
+      // 还原）由平台注入 JS 的 bindWindowRegion 声明式承载，webui WindowDragRegion
+      // 仅声明区域。
       windowControlsOverlay,
       // win32 窗口身份（WM_SETICON：任务栏/alt-tab）；与 overlay 正交，降级重试仍生效。
       ...windowIcon === null ? {} : { icon: windowIcon },