@siming-org/cli 0.7.3 → 0.7.4

package/dist/index.js

@@ -1307,17 +1307,24 @@ async function handleUpdateProject(client, id, patch) {
   return client.putJson(`/api/projects/${encodeURIComponent(id)}`, patch);
 }
 var OBJECT_ID_HEX = /^[a-f0-9]{24}$/;
-async function resolveProjectId(client, input) {
+function formatCandidateHint(projects, input) {
+  const q = input.toLowerCase();
+  const hits = projects.filter((p) => p.key.toLowerCase().includes(q) || p.name.toLowerCase().includes(q)).slice(0, 5).map((p) => `${p.key} (${p.name})`);
+  if (hits.length === 0) return void 0;
+  return `\u76F8\u8FD1\u9879\u76EE\uFF1A${hits.join("\u3001")}\uFF1B\u68C0\u67E5\u62FC\u5199\uFF0C\u6216 siming project list \u67E5\u770B\u5168\u90E8\u9879\u76EE`;
+}
+async function resolveProjectId(client, input, opts) {
   if (OBJECT_ID_HEX.test(input)) return { success: true, data: input };
   const list = await handleListProjects(client);
   if (!list.success) return list;
   const hit = list.data.find((p) => p.key === input);
   if (!hit) {
+    const candidateHint = opts?.withCandidates === true ? formatCandidateHint(list.data, input) : void 0;
     const error = {
       message: `project "${input}" not found`,
       httpStatus: 404,
       bizCode: "PROJECT_NOT_FOUND",
-      hint: `check \`siming project list\` for available keys; pass --project <key|id>`
+      hint: candidateHint ?? `check \`siming project list\` for available keys; pass --project <key|id>`
     };
     return fail(error);
   }
@@ -1331,6 +1338,74 @@ async function resolveProjectId(client, input) {
   }
   return { success: true, data: hit.id };
 }
+async function findProjectDetailByKey(client, key) {
+  const list = await handleListProjects(client);
+  if (!list.success) return list;
+  const hit = list.data.find((p) => p.key === key);
+  if (hit === void 0) {
+    return fail({
+      message: `workspace defaultProject "${key}" not found (removed or renamed)`,
+      httpStatus: 0,
+      bizCode: "DEFAULT_PROJECT_INVALID",
+      hint: DEFAULT_PROJECT_HINT
+    });
+  }
+  if (hit.id === void 0) {
+    return fail({
+      message: `workspace defaultProject "${key}" has no id`,
+      httpStatus: 500,
+      hint: "server returned a project without id; check `siming project list`"
+    });
+  }
+  return ok2({ id: hit.id, status: hit.status });
+}
+var MCP_PROJECT_HINT = "MCP \u8C03\u7528\u8BF7\u4F20 projectId \u5B57\u6BB5\uFF08\u9879\u76EE key \u6216 24-hex id \u53CC\u5F62\u6001\uFF0C\u81EA\u52A8\u5F52\u4E00\uFF09\uFF1B\u53EF\u7528 `siming project list` \u67E5\u8BE2\u53EF\u7528\u9879\u76EE";
+var DEFAULT_PROJECT_HINT = "siming config unset defaultProject \u540E\u91CD\u8BD5\uFF0C\u6216 siming config set defaultProject <key|id> \u91CD\u8BBE\uFF1Bsiming project list \u67E5\u770B\u53EF\u7528\u9879\u76EE";
+var PROJECT_REQUIRED_HINT = "\u663E\u5F0F\u4F20 --project <key|id>\uFF0C\u6216 siming config set defaultProject <key|id> \u914D\u7F6E\u9ED8\u8BA4\u9879\u76EE\uFF1Bsiming project list \u67E5\u770B\u53EF\u7528\u9879\u76EE";
+async function resolveScopedProject(client, explicit, tail, opts) {
+  const value = explicit !== void 0 && explicit.trim().length > 0 ? explicit.trim() : void 0;
+  if (value !== void 0) {
+    const r = await resolveProjectId(client, value, { withCandidates: true });
+    if (!r.success) {
+      return fail(
+        opts?.channel === "mcp" && r.error.bizCode === "PROJECT_NOT_FOUND" ? { ...r.error, hint: MCP_PROJECT_HINT } : r.error
+      );
+    }
+    return ok2({ projectId: r.data, source: "explicit" });
+  }
+  if (tail === "explicit-only") {
+    return ok2({ source: "explicit" });
+  }
+  const wsDefault = readWorkspaceConfig()?.defaultProject;
+  if (wsDefault !== void 0) {
+    const detail = await findProjectDetailByKey(client, wsDefault);
+    if (!detail.success) return detail;
+    if (detail.data.status !== "active") {
+      return fail({
+        message: `workspace defaultProject "${wsDefault}" is archived`,
+        httpStatus: 0,
+        bizCode: "DEFAULT_PROJECT_INVALID",
+        hint: DEFAULT_PROJECT_HINT
+      });
+    }
+    return ok2({ projectId: detail.data.id, source: "workspace-default" });
+  }
+  if (tail === "ws-default") {
+    return ok2({ source: "delegated" });
+  }
+  const list = await handleListProjects(client);
+  if (!list.success) return list;
+  const instanceDefault = list.data.find((p) => p.key === "default");
+  if (instanceDefault === void 0 || instanceDefault.id === void 0) {
+    return fail({
+      message: `${opts?.commandLabel ?? "this command"} needs a project: no --project given, no workspace defaultProject, and no key=default project on server`,
+      httpStatus: 0,
+      bizCode: "PROJECT_REQUIRED",
+      hint: PROJECT_REQUIRED_HINT
+    });
+  }
+  return ok2({ projectId: instanceDefault.id, source: "instance-default" });
+}
 async function resolveProjectKey(client, input) {
   const list = await handleListProjects(client);
   if (!list.success) return list;
@@ -1463,7 +1538,7 @@ var issueArgs = {
   // create
   title: z3.string().optional(),
   description: z3.string().optional(),
-  // 公共：create 缺省按工作区 defaultProject，无配置时按 key=default / query 过滤（24-hex）
+  // 公共：create 缺省按工作区 defaultProject（key|id 双形态通道层归一，失效报错）/ query 过滤（空/未传不过滤）
   projectId: z3.string().optional(),
   // query：view 缺省 open（有效未跟进完）；与 REST 词汇统一（status/taskId 指定时切对应过滤）
   view: hostNeutralEnum(z3.enum(["open", "all"])).optional(),
@@ -1608,7 +1683,7 @@ function createMcpServer() {
   const client = createClient(void 0, "mcp");
   server.tool(
     "siming_task",
-    "task \u8D44\u6E90\u57DF\u805A\u5408\u5DE5\u5177\uFF08\u4EFB\u52A1\u5168\u64CD\u4F5C\u7ECF\u672C\u5DE5\u5177 + action \u53C2\u6570\uFF09\u3002action \u5FC5\u586B\uFF1B\u8C03\u7528\u65B9\u5E94\u5728 fieldMask \u4E2D\u5217\u51FA\u672C\u6B21\u771F\u5B9E\u63D0\u4F9B\u7684\u53EF\u9009\u5B57\u6BB5\uFF0Cmask \u5916\u7531\u5BBF\u4E3B\u81EA\u52A8\u586B\u5145\u7684\u7A7A\u4E32\u3001\u7A7A\u6570\u7EC4\u3001false\u30010 \u5747\u5FFD\u7565\uFF0Cmask \u5185\u7A7A\u6570\u7EC4/false \u8868\u793A\u663E\u5F0F\u6E05\u7A7A\u6216\u5173\u95ED\uFF1B\u5404 action \u56FA\u5B9A\u5FC5\u586B\u5B57\u6BB5\u65E0\u9700\u5199\u5165 mask\u3002\u5176\u4F59\u53C2\u6570\u5168\u53EF\u9009\u3001\u6309 action \u8FD0\u884C\u65F6\u6821\u9A8C\u5FC5\u586B\uFF08\u7F3A\u5931\u8FD4\u56DE\u5931\u8D25\u4E09\u8981\u7D20\uFF1A\u5BF9\u8C61+\u6839\u56E0+\u4FEE\u590D\u6307\u5F15\uFF09\u3002\u5199\u64CD\u4F5C\uFF08create/doc-*/record-*/archnote-add/pause/resume/cancel\uFF09\u54CD\u5E94\u4E3A\u8F7B\u91CF\u56DE\u6267\uFF1A{taskId, updated(\u89E6\u53CA\u5B57\u6BB5\u8DEF\u5F84), entry(\u65B0\u6761\u76EE id+kind\uFF0C\u4F9B\u540E\u7EED patch \u5B9A\u4F4D), echo(\u5199\u5165\u5185\u5BB9\u56DE\u663E), updatedAt, task(\u4EFB\u52A1\u8FDB\u5EA6\u6458\u8981 progress: {completed,total})}\u2014\u2014\u4E0D\u8FD4\u56DE\u5B8C\u6574\u4EFB\u52A1\u5B9E\u4F53\u3002action \u6E05\u5355\uFF08\u62EC\u53F7\u5185\u4E3A\u8BE5 action \u5FC5\u586B\u53C2\u6570\uFF09\uFF1Acreate(templateId,taskTitle,track\uFF1B\u53EF\u9009 type=feature|bugfix|ui-tweak|research\u3001skipNodes\u3001projectId\uFF1BtemplateId \u652F\u6301 code|id \u53CC\u5F62\u6001\u2014\u2014code \u4E3A\u6A21\u677F\u4E1A\u52A1\u6807\u8BC6\uFF08\u9879\u76EE\u5185\u552F\u4E00\u3001kebab-case \u5FC5\u542B\u8FDE\u5B57\u7B26\uFF0C\u5982 full-workflow\uFF09\uFF0C\u63A8\u8350\u5F15\u7528\u5F62\u6001\uFF0C\u5BFB\u5740\u987B\u914D projectId \u6307\u5B9A\u9879\u76EE\u57DF\uFF1B24-hex \u6570\u636E\u5E93 id \u76F4\u67E5\u517C\u5BB9\uFF1Bcode \u5F62\u6001\u4E0D\u5B58\u5728\u65F6\u9519\u8BEF\u542B candidates \u76F8\u8FD1\u5019\u9009\u6E05\u5355\uFF08id/code/name \u22645 \u6761\uFF09\uFF1B\u54CD\u5E94 {task, firstNode}\u2014\u2014firstNode \u5373\u9996\u8282\u70B9\u5B8C\u6574\u8D44\u6599\u5305\uFF0C\u514D\u8C03 context)\uFF1Bquery(taskId \u8FD4\u56DE\u5355\u4EFB\u52A1\u8BE6\u60C5\uFF0C\u7F3A\u7701\u8FD4\u56DE\u5217\u8868\uFF0C\u53EF\u9009 status/track/projectId/page/limit)\uFF1Bcontext(taskId\uFF1B\u53EF\u9009 view=basic|full\u2014\u2014basic \u7F3A\u7701\u4E0D\u643A\u5E26 artifact \u5168\u6587\u5FEB\u7167\uFF0Cfull \u65AD\u70B9\u7EED\u8DD1\u9700\u5386\u53F2\u4EA7\u7269\u5168\u6587\u65F6\u7528\u3002\u26A0 \u514D\u91CD\u8BFB\uFF1Aadvance/approve \u6D41\u8F6C\u54CD\u5E94\u5DF2\u542B\u4E0B\u4E00\u8282\u70B9\u5B8C\u6574\u8D44\u6599\u5305\uFF0C\u540C\u4F1A\u8BDD\u5185\u6D41\u8F6C\u540E\u76F4\u63A5\u5F00\u5DE5\u3001\u65E0\u9700\u518D\u8C03 context\uFF1B\u4EC5\u65B0\u4F1A\u8BDD/\u65AD\u70B9\u7EED\u8DD1\u8C03\u7528)\uFF1Bnode(taskId,view=prompt|skills\uFF1BnodeId \u7F3A\u7701\u7528\u5F53\u524D\u8282\u70B9\uFF1B\u26A0 view \u503C\u968F action \u4E0D\u540C\uFF1Anode\u2192prompt|skills\uFF0Ccontext\u2192basic|full\uFF0C\u9519\u914D\u62A5\u9519)\uFF1Badvance(taskId\uFF1Bnote \u5199 history\u3001summary \u5199 nodeRecords\uFF0C\u4E24\u4F4D\u72EC\u7ACB\uFF1B\u54CD\u5E94\u5DF2\u542B\u4E0B\u4E00\u8282\u70B9\u8D44\u6599\u5305\uFF0C\u540C\u4F1A\u8BDD\u514D\u91CD\u8BFB context)\uFF1Bapprove(taskId,decision=approved|rejected\uFF1B\u53EF\u9009 comment\uFF1B\u54CD\u5E94\u5DF2\u542B\u4E0B\u4E00\u8282\u70B9\u8D44\u6599\u5305\uFF0C\u540C\u4F1A\u8BDD\u514D\u91CD\u8BFB context)\uFF1Bpause(taskId\uFF1B\u53EF\u9009 reason)\uFF1Bresume(taskId\uFF1B\u53EF\u9009 resumeNote)\uFF1Bcancel(taskId\uFF1B\u53EF\u9009 reason 1-500 \u5B57\u7B26\uFF1B\u26A0 \u7EC8\u6001\u4E0D\u53EF\u9006\u2014\u2014active/paused \u53EF\u53D6\u6D88\uFF0Ccompleted/cancelled \u62D2\u7EDD\u5E76\u8FD4\u56DE TASK_TERMINATED\uFF1B\u53D6\u6D88\u540E\u7ECF\u672C\u5DE5\u5177\u7684\u6D41\u8F6C\u4E0E\u8BB0\u5F55\u5199\u64CD\u4F5C\u88AB\u62D2)\uFF1Bhistory(taskId)\uFF1Binstance(taskId\u2014\u2014\u67E5\u770B\u4EFB\u52A1 DAG \u5B9E\u4F8B\u5FEB\u7167\uFF1A\u521B\u5EFA\u4EFB\u52A1\u65F6\u51BB\u7ED3\u7684\u6A21\u677F\u5B9E\u4F8B\uFF0C\u6A21\u677F\u540E\u7EED\u53D8\u66F4\u4E0D\u56DE\u6EAF)\u3002\u8BB0\u5F55\u5199\u5165\uFF1Arecord-set(taskId,node,summary)\uFF1Brecord-check-add(taskId,node,item\uFF1B\u53EF\u9009 passed \u7F3A\u7701 true\uFF1B\u56DE\u6267 entry.id \u4F9B record-check-patch \u5B9A\u4F4D)\uFF1Brecord-check-patch(taskId,node,checkId\uFF1B\u53EF\u9009 passed)\uFF1Brecord-artifact-add(taskId,node,artifactType=prd|tech|code|test|doc|other\uFF1Bpath \u7EAF\u5F15\u7528 / file \u8BFB\u672C\u673A\u6587\u4EF6 / content \u76F4\u4F20\u5168\u6587\u2014\u2014file \u4E0E content\u3001file \u4E0E path \u4E92\u65A5\uFF0Ccontent \u53EF\u4E0E path \u6210\u5BF9\u6216\u5355\u72EC\uFF0C\u5355\u72EC\u65F6\u767B\u8BB0\u503C\u5408\u6210 mcp-inline/<type>\uFF1B\u53EF\u9009 note)\uFF1Brecord-confirm(taskId,node,quote\u2014\u2014\u6682\u505C\u70B9\u7528\u6237\u786E\u8BA4\u539F\u6587\u9010\u5B57)\uFF1Brecord-decision-add(taskId,node,topic,decisionText)\uFF1Brecord-review-set(taskId,node,verdict=pass|fail,rounds,critical)\u3002\u9700\u6C42\u6587\u6863\uFF1Adoc-set(taskId\uFF1Bwhat/why/trackNote \u81F3\u5C11\u4F20\u4E00)\uFF1Bdoc-acceptance-add(taskId,text)\uFF1Bdoc-non-goal-add(taskId,text)\u3002\u7D20\u6750\uFF1Aarchnote-add(taskId,text)\u3002\u6279\u91CF\u5F62\u6001\uFF08\u63A8\u8350\uFF0C\u516D\u7C7B\u540C\u6784\uFF09\uFF1Arecord-check-add \u4F20 checkItems=[{item,passed?}]\u3001record-artifact-add \u4F20 artifactEntries=[{artifactType,path?/file?/content?,note?}]\u3001record-decision-add \u4F20 decisionEntries=[{topic,decisionText}]\u3001doc-acceptance-add/doc-non-goal-add/archnote-add \u4F20 textItems=[string]\u2014\u2014\u6279\u91CF\u53C2\u6570\u4E0E\u5355\u6761\u53C2\u6570\u4E8C\u9009\u4E00\uFF0C\u4E00\u6B21\u8C03\u7528\u5199\u591A\u6761\uFF08\u4E0A\u9650 50 \u6761/\u6279\uFF0Cartifact \u5168\u6587\u5FEB\u7167\u603B\u91CF \u22642M \u5B57\u7B26/\u6279\uFF09\uFF1B\u90E8\u5206\u5931\u8D25\u4FDD\u7559\u6210\u529F\u6761\u76EE\u5E76\u9010\u6761\u62A5\u544A\uFF08failures[].index=\u539F\u59CB\u63D0\u4EA4\u5E8F\uFF0C\u53EA\u91CD\u8BD5\u5931\u8D25\u9879\uFF09\uFF0Capplied=0 \u6574\u4F53\u62A5\u5931\u8D25\u3002",
+    "task \u8D44\u6E90\u57DF\u805A\u5408\u5DE5\u5177\uFF08\u4EFB\u52A1\u5168\u64CD\u4F5C\u7ECF\u672C\u5DE5\u5177 + action \u53C2\u6570\uFF09\u3002action \u5FC5\u586B\uFF1B\u8C03\u7528\u65B9\u5E94\u5728 fieldMask \u4E2D\u5217\u51FA\u672C\u6B21\u771F\u5B9E\u63D0\u4F9B\u7684\u53EF\u9009\u5B57\u6BB5\uFF0Cmask \u5916\u7531\u5BBF\u4E3B\u81EA\u52A8\u586B\u5145\u7684\u7A7A\u4E32\u3001\u7A7A\u6570\u7EC4\u3001false\u30010 \u5747\u5FFD\u7565\uFF0Cmask \u5185\u7A7A\u6570\u7EC4/false \u8868\u793A\u663E\u5F0F\u6E05\u7A7A\u6216\u5173\u95ED\uFF1B\u5404 action \u56FA\u5B9A\u5FC5\u586B\u5B57\u6BB5\u65E0\u9700\u5199\u5165 mask\u3002\u5176\u4F59\u53C2\u6570\u5168\u53EF\u9009\u3001\u6309 action \u8FD0\u884C\u65F6\u6821\u9A8C\u5FC5\u586B\uFF08\u7F3A\u5931\u8FD4\u56DE\u5931\u8D25\u4E09\u8981\u7D20\uFF1A\u5BF9\u8C61+\u6839\u56E0+\u4FEE\u590D\u6307\u5F15\uFF09\u3002projectId \u4E3A key|id \u53CC\u5F62\u6001\uFF0C\u901A\u9053\u5C42\u81EA\u52A8\u5F52\u4E00\u4E3A 24-hex id\uFF1B\u663E\u5F0F\u6307\u5B9A\u89E3\u6790\u5931\u8D25\u62A5\u9519\u4E0D\u515C\u5E95\uFF1B\u7F3A\u7701\u8BED\u4E49\u6309 action\uFF1Acreate \u843D\u9ED8\u8BA4\u9879\u76EE\u94FE\uFF08\u5DE5\u4F5C\u533A defaultProject \u5931\u6548\u62A5\u9519\uFF0C\u65E0\u914D\u7F6E\u4E0D\u4F20\u7531 server \u6309\u6A21\u677F\u5F52\u5C5E\u515C\u5E95\uFF09\uFF0Cquery \u4E0D\u8FC7\u6EE4\uFF08\u5168\u5C40\u67E5\u8BE2\uFF09\u3002\u5199\u64CD\u4F5C\uFF08create/doc-*/record-*/archnote-add/pause/resume/cancel\uFF09\u54CD\u5E94\u4E3A\u8F7B\u91CF\u56DE\u6267\uFF1A{taskId, updated(\u89E6\u53CA\u5B57\u6BB5\u8DEF\u5F84), entry(\u65B0\u6761\u76EE id+kind\uFF0C\u4F9B\u540E\u7EED patch \u5B9A\u4F4D), echo(\u5199\u5165\u5185\u5BB9\u56DE\u663E), updatedAt, task(\u4EFB\u52A1\u8FDB\u5EA6\u6458\u8981 progress: {completed,total})}\u2014\u2014\u4E0D\u8FD4\u56DE\u5B8C\u6574\u4EFB\u52A1\u5B9E\u4F53\u3002action \u6E05\u5355\uFF08\u62EC\u53F7\u5185\u4E3A\u8BE5 action \u5FC5\u586B\u53C2\u6570\uFF09\uFF1Acreate(templateId,taskTitle,track\uFF1B\u53EF\u9009 type=feature|bugfix|ui-tweak|research\u3001skipNodes\u3001projectId\uFF1BtemplateId \u652F\u6301 code|id \u53CC\u5F62\u6001\u2014\u2014code \u4E3A\u6A21\u677F\u4E1A\u52A1\u6807\u8BC6\uFF08\u9879\u76EE\u5185\u552F\u4E00\u3001kebab-case \u5FC5\u542B\u8FDE\u5B57\u7B26\uFF0C\u5982 full-workflow\uFF09\uFF0C\u63A8\u8350\u5F15\u7528\u5F62\u6001\uFF0C\u5BFB\u5740\u987B\u914D projectId \u6307\u5B9A\u9879\u76EE\u57DF\uFF1B24-hex \u6570\u636E\u5E93 id \u76F4\u67E5\u517C\u5BB9\uFF1Bcode \u5F62\u6001\u4E0D\u5B58\u5728\u65F6\u9519\u8BEF\u542B candidates \u76F8\u8FD1\u5019\u9009\u6E05\u5355\uFF08id/code/name \u22645 \u6761\uFF09\uFF1B\u54CD\u5E94 {task, firstNode}\u2014\u2014firstNode \u5373\u9996\u8282\u70B9\u5B8C\u6574\u8D44\u6599\u5305\uFF0C\u514D\u8C03 context)\uFF1Bquery(taskId \u8FD4\u56DE\u5355\u4EFB\u52A1\u8BE6\u60C5\uFF0C\u7F3A\u7701\u8FD4\u56DE\u5217\u8868\uFF0C\u53EF\u9009 status/track/projectId/page/limit)\uFF1Bcontext(taskId\uFF1B\u53EF\u9009 view=basic|full\u2014\u2014basic \u7F3A\u7701\u4E0D\u643A\u5E26 artifact \u5168\u6587\u5FEB\u7167\uFF0Cfull \u65AD\u70B9\u7EED\u8DD1\u9700\u5386\u53F2\u4EA7\u7269\u5168\u6587\u65F6\u7528\u3002\u26A0 \u514D\u91CD\u8BFB\uFF1Aadvance/approve \u6D41\u8F6C\u54CD\u5E94\u5DF2\u542B\u4E0B\u4E00\u8282\u70B9\u5B8C\u6574\u8D44\u6599\u5305\uFF0C\u540C\u4F1A\u8BDD\u5185\u6D41\u8F6C\u540E\u76F4\u63A5\u5F00\u5DE5\u3001\u65E0\u9700\u518D\u8C03 context\uFF1B\u4EC5\u65B0\u4F1A\u8BDD/\u65AD\u70B9\u7EED\u8DD1\u8C03\u7528)\uFF1Bnode(taskId,view=prompt|skills\uFF1BnodeId \u7F3A\u7701\u7528\u5F53\u524D\u8282\u70B9\uFF1B\u26A0 view \u503C\u968F action \u4E0D\u540C\uFF1Anode\u2192prompt|skills\uFF0Ccontext\u2192basic|full\uFF0C\u9519\u914D\u62A5\u9519)\uFF1Badvance(taskId\uFF1Bnote \u5199 history\u3001summary \u5199 nodeRecords\uFF0C\u4E24\u4F4D\u72EC\u7ACB\uFF1B\u54CD\u5E94\u5DF2\u542B\u4E0B\u4E00\u8282\u70B9\u8D44\u6599\u5305\uFF0C\u540C\u4F1A\u8BDD\u514D\u91CD\u8BFB context)\uFF1Bapprove(taskId,decision=approved|rejected\uFF1B\u53EF\u9009 comment\uFF1B\u54CD\u5E94\u5DF2\u542B\u4E0B\u4E00\u8282\u70B9\u8D44\u6599\u5305\uFF0C\u540C\u4F1A\u8BDD\u514D\u91CD\u8BFB context)\uFF1Bpause(taskId\uFF1B\u53EF\u9009 reason)\uFF1Bresume(taskId\uFF1B\u53EF\u9009 resumeNote)\uFF1Bcancel(taskId\uFF1B\u53EF\u9009 reason 1-500 \u5B57\u7B26\uFF1B\u26A0 \u7EC8\u6001\u4E0D\u53EF\u9006\u2014\u2014active/paused \u53EF\u53D6\u6D88\uFF0Ccompleted/cancelled \u62D2\u7EDD\u5E76\u8FD4\u56DE TASK_TERMINATED\uFF1B\u53D6\u6D88\u540E\u7ECF\u672C\u5DE5\u5177\u7684\u6D41\u8F6C\u4E0E\u8BB0\u5F55\u5199\u64CD\u4F5C\u88AB\u62D2)\uFF1Bhistory(taskId)\uFF1Binstance(taskId\u2014\u2014\u67E5\u770B\u4EFB\u52A1 DAG \u5B9E\u4F8B\u5FEB\u7167\uFF1A\u521B\u5EFA\u4EFB\u52A1\u65F6\u51BB\u7ED3\u7684\u6A21\u677F\u5B9E\u4F8B\uFF0C\u6A21\u677F\u540E\u7EED\u53D8\u66F4\u4E0D\u56DE\u6EAF)\u3002\u8BB0\u5F55\u5199\u5165\uFF1Arecord-set(taskId,node,summary)\uFF1Brecord-check-add(taskId,node,item\uFF1B\u53EF\u9009 passed \u7F3A\u7701 true\uFF1B\u56DE\u6267 entry.id \u4F9B record-check-patch \u5B9A\u4F4D)\uFF1Brecord-check-patch(taskId,node,checkId\uFF1B\u53EF\u9009 passed)\uFF1Brecord-artifact-add(taskId,node,artifactType=prd|tech|code|test|doc|other\uFF1Bpath \u7EAF\u5F15\u7528 / file \u8BFB\u672C\u673A\u6587\u4EF6 / content \u76F4\u4F20\u5168\u6587\u2014\u2014file \u4E0E content\u3001file \u4E0E path \u4E92\u65A5\uFF0Ccontent \u53EF\u4E0E path \u6210\u5BF9\u6216\u5355\u72EC\uFF0C\u5355\u72EC\u65F6\u767B\u8BB0\u503C\u5408\u6210 mcp-inline/<type>\uFF1B\u53EF\u9009 note)\uFF1Brecord-confirm(taskId,node,quote\u2014\u2014\u6682\u505C\u70B9\u7528\u6237\u786E\u8BA4\u539F\u6587\u9010\u5B57)\uFF1Brecord-decision-add(taskId,node,topic,decisionText)\uFF1Brecord-review-set(taskId,node,verdict=pass|fail,rounds,critical)\u3002\u9700\u6C42\u6587\u6863\uFF1Adoc-set(taskId\uFF1Bwhat/why/trackNote \u81F3\u5C11\u4F20\u4E00)\uFF1Bdoc-acceptance-add(taskId,text)\uFF1Bdoc-non-goal-add(taskId,text)\u3002\u7D20\u6750\uFF1Aarchnote-add(taskId,text)\u3002\u6279\u91CF\u5F62\u6001\uFF08\u63A8\u8350\uFF0C\u516D\u7C7B\u540C\u6784\uFF09\uFF1Arecord-check-add \u4F20 checkItems=[{item,passed?}]\u3001record-artifact-add \u4F20 artifactEntries=[{artifactType,path?/file?/content?,note?}]\u3001record-decision-add \u4F20 decisionEntries=[{topic,decisionText}]\u3001doc-acceptance-add/doc-non-goal-add/archnote-add \u4F20 textItems=[string]\u2014\u2014\u6279\u91CF\u53C2\u6570\u4E0E\u5355\u6761\u53C2\u6570\u4E8C\u9009\u4E00\uFF0C\u4E00\u6B21\u8C03\u7528\u5199\u591A\u6761\uFF08\u4E0A\u9650 50 \u6761/\u6279\uFF0Cartifact \u5168\u6587\u5FEB\u7167\u603B\u91CF \u22642M \u5B57\u7B26/\u6279\uFF09\uFF1B\u90E8\u5206\u5931\u8D25\u4FDD\u7559\u6210\u529F\u6761\u76EE\u5E76\u9010\u6761\u62A5\u544A\uFF08failures[].index=\u539F\u59CB\u63D0\u4EA4\u5E8F\uFF0C\u53EA\u91CD\u8BD5\u5931\u8D25\u9879\uFF09\uFF0Capplied=0 \u6574\u4F53\u62A5\u5931\u8D25\u3002",
     taskArgs,
     async (rawArgs) => {
       const masked = applyFieldMask(rawArgs, TASK_FIELD_SPECS);
@@ -1620,13 +1695,15 @@ function createMcpServer() {
           if (templateId === void 0 || taskTitle === void 0 || track === void 0) {
             return requireError("create", ["templateId", "taskTitle", "track"], args);
           }
+          const projectR = await resolveScopedProject(client, args.projectId, "ws-default", { channel: "mcp" });
+          if (!projectR.success) return mcpContent(projectR);
           const input = {
             title: taskTitle,
             track,
             dagTemplateId: templateId,
             ...args.type !== void 0 ? { type: args.type } : {},
             ...args.skipNodes !== void 0 ? { skipNodes: args.skipNodes } : {},
-            ...args.projectId !== void 0 ? { projectId: args.projectId } : {}
+            ...projectR.data.projectId !== void 0 ? { projectId: projectR.data.projectId } : {}
           };
           return mcpContent(await handleCreateTask(client, input));
         }
@@ -1640,11 +1717,17 @@ function createMcpServer() {
           if (args.taskId) {
             return mcpContent(await handleQueryState(client, args.taskId));
           }
+          let queryProjectId;
+          if (args.projectId !== void 0 && args.projectId.trim().length > 0) {
+            const pr = await resolveScopedProject(client, args.projectId, "explicit-only", { channel: "mcp" });
+            if (!pr.success) return mcpContent(pr);
+            queryProjectId = pr.data.projectId;
+          }
           return mcpContent(
             await handleListTasks(client, {
               ...args.status !== void 0 ? { status: args.status } : {},
               ...args.track !== void 0 ? { track: args.track } : {},
-              ...args.projectId !== void 0 ? { projectId: args.projectId } : {},
+              ...queryProjectId !== void 0 ? { projectId: queryProjectId } : {},
               ...args.page !== void 0 ? { page: args.page } : {},
               ...args.limit !== void 0 ? { limit: args.limit } : {}
             })
@@ -1942,26 +2025,38 @@ function createMcpServer() {
   );
   server.tool(
     "siming_template",
-    "DAG \u6A21\u677F\u53EA\u8BFB\u67E5\u8BE2\uFF08\u4EFB\u52A1\u521B\u5EFA\u524D\u9009\u6A21\u677F/\u6838\u5BF9\u6A21\u677F\u7ED3\u6784\u7528\uFF1B\u672C\u5DE5\u5177\u65E0\u5199\u64CD\u4F5C\uFF09\u3002action\uFF1Alist=\u6A21\u677F\u5217\u8868\uFF08\u6982\u8981\u6295\u5F71\uFF0C\u542B id/code/name/version/isDefault/projectId/nodeCount/nodes \u6982\u8981/pausePoints/description\uFF0C\u4E0D\u542B\u8282\u70B9 prompt \u5168\u6587\uFF1B\u53EF\u9009 projectId \u8FC7\u6EE4\u9879\u76EE\u57DF\uFF1B\u8FD4\u56DE code \u4E3A\u540E\u7EED\u5F15\u7528\u6A21\u677F\u7684\u63A8\u8350\u5F62\u6001\uFF09\uFF1Bshow=\u6A21\u677F\u8BE6\u60C5\uFF08\u542B\u5168\u90E8\u8282\u70B9 prompt\uFF1BtemplateId \u652F\u6301 code|id \u53CC\u5F62\u6001\u2014\u2014code \u4E3A\u4E1A\u52A1\u6807\u8BC6\uFF08\u9879\u76EE\u5185\u552F\u4E00\u3001\u521B\u5EFA\u540E\u4E0D\u53EF\u53D8\u3001kebab-case \u5FC5\u542B\u8FDE\u5B57\u7B26\u4E14\u975E\u7EAF 24-hex \u5F62\u6001\uFF0C\u5982 full-workflow\uFF09\uFF0Ccode \u5F62\u6001\u5BFB\u5740\u987B\u914D projectId \u6307\u5B9A\u9879\u76EE\u57DF\uFF1B24 \u4F4D\u6570\u636E\u5E93 id \u76F4\u67E5\u517C\u5BB9\uFF0C\u65E0\u9700 projectId\uFF09\u3002\u6A21\u677F\u4E0D\u5B58\u5728\u65F6\u9519\u8BEF\u4FE1\u606F\u542B candidates \u5019\u9009\u6E05\u5355\uFF08\u9879\u76EE\u5185\u76F8\u8FD1\u6A21\u677F\u7684 id/code/name\uFF0C\u6309\u76F8\u5173\u5EA6\u6392\u5E8F\u4E0A\u9650 5 \u6761\uFF09\u2014\u2014\u8F6C\u5F55\u9519\u8BEF\u53EF\u636E\u6E05\u5355\u5F53\u573A\u7EA0\u6B63\u3002\u505C\u7528\u6A21\u677F\uFF08Web \u7BA1\u7406\u53F0\u542F\u505C\uFF09\uFF1Alist \u9ED8\u8BA4\u4E0D\u542B\u505C\u7528\u6A21\u677F\uFF1Bshow \u6309 code|id \u4ECD\u53EF\u8BFB\uFF1B\u7528\u505C\u7528\u6A21\u677F\u521B\u5EFA\u4EFB\u52A1\u88AB\u62D2\uFF08409 TEMPLATE_DISABLED\uFF09\u2014\u2014\u9700\u5728 Web \u7BA1\u7406\u53F0\u91CD\u65B0\u542F\u7528\u540E\u518D\u5EFA\u4EFB\u52A1\u3002\u6A21\u677F\u5199\u5165\u4E0E\u6F14\u8FDB\u4E0D\u5728 MCP\uFF1A\u5BFC\u5165\uFF08\u542B\u540C\u540D\u66F4\u65B0/\u9884\u89C8/\u5B8C\u6574\u4F9D\u8D56\u95ED\u5305 bundle\uFF09\u7528 CLI `siming dag template import`\uFF0C\u6A21\u677F\u5347\u7EA7\u9884\u68C0/\u6267\u884C\u7528 CLI `siming dag template upgrade plan/apply`\uFF08bash \u6267\u884C\uFF0C--help \u67E5\u7528\u6CD5\uFF09\u3002",
+    "DAG \u6A21\u677F\u53EA\u8BFB\u67E5\u8BE2\uFF08\u4EFB\u52A1\u521B\u5EFA\u524D\u9009\u6A21\u677F/\u6838\u5BF9\u6A21\u677F\u7ED3\u6784\u7528\uFF1B\u672C\u5DE5\u5177\u65E0\u5199\u64CD\u4F5C\uFF09\u3002action\uFF1Alist=\u6A21\u677F\u5217\u8868\uFF08\u6982\u8981\u6295\u5F71\uFF0C\u542B id/code/name/version/isDefault/projectId/nodeCount/nodes \u6982\u8981/pausePoints/description\uFF0C\u4E0D\u542B\u8282\u70B9 prompt \u5168\u6587\uFF1B\u53EF\u9009 projectId \u8FC7\u6EE4\u9879\u76EE\u57DF\u2014\u2014key|id \u53CC\u5F62\u6001\uFF0C\u901A\u9053\u5C42\u81EA\u52A8\u5F52\u4E00\uFF0C\u7A7A/\u672A\u4F20\u4E0D\u8FC7\u6EE4\uFF1B\u8FD4\u56DE code \u4E3A\u540E\u7EED\u5F15\u7528\u6A21\u677F\u7684\u63A8\u8350\u5F62\u6001\uFF09\uFF1Bshow=\u6A21\u677F\u8BE6\u60C5\uFF08\u542B\u5168\u90E8\u8282\u70B9 prompt\uFF1BtemplateId \u652F\u6301 code|id \u53CC\u5F62\u6001\u2014\u2014code \u4E3A\u4E1A\u52A1\u6807\u8BC6\uFF08\u9879\u76EE\u5185\u552F\u4E00\u3001\u521B\u5EFA\u540E\u4E0D\u53EF\u53D8\u3001kebab-case \u5FC5\u542B\u8FDE\u5B57\u7B26\u4E14\u975E\u7EAF 24-hex \u5F62\u6001\uFF0C\u5982 full-workflow\uFF09\uFF0Ccode \u5F62\u6001\u5BFB\u5740\u987B\u914D projectId \u6307\u5B9A\u9879\u76EE\u57DF\u2014\u2014key|id \u53CC\u5F62\u6001\u81EA\u52A8\u5F52\u4E00\uFF0C\u7F3A\u7701\u6309\u5DE5\u4F5C\u533A defaultProject\uFF08\u5931\u6548\u62A5\u9519\uFF09\uFF0C\u65E0\u914D\u7F6E\u4E0D\u4F20\u7531 server \u63D0\u793A\u8865\u57DF\uFF1B24 \u4F4D\u6570\u636E\u5E93 id \u76F4\u67E5\u517C\u5BB9\uFF0C\u65E0\u9700 projectId\uFF09\u3002\u6A21\u677F\u4E0D\u5B58\u5728\u65F6\u9519\u8BEF\u4FE1\u606F\u542B candidates \u5019\u9009\u6E05\u5355\uFF08\u9879\u76EE\u5185\u76F8\u8FD1\u6A21\u677F\u7684 id/code/name\uFF0C\u6309\u76F8\u5173\u5EA6\u6392\u5E8F\u4E0A\u9650 5 \u6761\uFF09\u2014\u2014\u8F6C\u5F55\u9519\u8BEF\u53EF\u636E\u6E05\u5355\u5F53\u573A\u7EA0\u6B63\u3002\u505C\u7528\u6A21\u677F\uFF08Web \u7BA1\u7406\u53F0\u542F\u505C\uFF09\uFF1Alist \u9ED8\u8BA4\u4E0D\u542B\u505C\u7528\u6A21\u677F\uFF1Bshow \u6309 code|id \u4ECD\u53EF\u8BFB\uFF1B\u7528\u505C\u7528\u6A21\u677F\u521B\u5EFA\u4EFB\u52A1\u88AB\u62D2\uFF08409 TEMPLATE_DISABLED\uFF09\u2014\u2014\u9700\u5728 Web \u7BA1\u7406\u53F0\u91CD\u65B0\u542F\u7528\u540E\u518D\u5EFA\u4EFB\u52A1\u3002\u6A21\u677F\u5199\u5165\u4E0E\u6F14\u8FDB\u4E0D\u5728 MCP\uFF1A\u5BFC\u5165\uFF08\u542B\u540C\u540D\u66F4\u65B0/\u9884\u89C8/\u5B8C\u6574\u4F9D\u8D56\u95ED\u5305 bundle\uFF09\u7528 CLI `siming dag template import`\uFF0C\u6A21\u677F\u5347\u7EA7\u9884\u68C0/\u6267\u884C\u7528 CLI `siming dag template upgrade plan/apply`\uFF08bash \u6267\u884C\uFF0C--help \u67E5\u7528\u6CD5\uFF09\u3002",
     templateArgs,
     async (args) => {
       switch (args.action) {
         case "list": {
-          const result = await handleListTemplates(client, args.projectId);
+          let listProjectId;
+          if (args.projectId !== void 0 && args.projectId.trim().length > 0) {
+            const pr = await resolveScopedProject(client, args.projectId, "explicit-only", { channel: "mcp" });
+            if (!pr.success) return mcpContent(pr);
+            listProjectId = pr.data.projectId;
+          }
+          const result = await handleListTemplates(client, listProjectId);
           if (!result.success) return mcpContent(result);
           return mcpContent(ok2(result.data.map(toTemplateSummary)));
         }
         case "show": {
-          const { templateId, projectId } = args;
+          const { templateId } = args;
           if (templateId === void 0) return requireError("show", ["templateId"], args);
-          return mcpContent(await handleGetTemplate(client, templateId, projectId));
+          let showProjectId;
+          if (!/^[a-f0-9]{24}$/.test(templateId)) {
+            const pr = await resolveScopedProject(client, args.projectId, "ws-default", { channel: "mcp" });
+            if (!pr.success) return mcpContent(pr);
+            showProjectId = pr.data.projectId;
+          }
+          return mcpContent(await handleGetTemplate(client, templateId, showProjectId));
         }
       }
     }
   );
   server.tool(
     "siming_issue",
-    `\u95EE\u9898\u6C60\u5DE5\u5177\uFF08T202609150002\uFF09\uFF1A\u5C0F\u95EE\u9898\u4F4E\u6210\u672C\u5165\u6C60\uFF0C\u6C89\u6DC0\u540E\u7EDF\u4E00\u6574\u7406\u8F6C\u4EFB\u52A1\uFF08\u8F6C\u4EFB\u52A1/\u6574\u7406\u91CD\u4EA4\u4E92\u8D70 CLI siming issue convert \u6216 Web\uFF0C\u4E0D\u5728\u672C\u5DE5\u5177\u9762\uFF09\u3002action\uFF1Acreate(title \u5FC5\u586B 1-200 \u5B57\uFF1B\u53EF\u9009 description\u3001projectId\u2014\u2014key|id \u53CC\u5F62\u6001\uFF0C\u901A\u9053\u5C42\u81EA\u52A8\u5F52\u4E00\u4E3A 24-hex id\uFF08hex \u96F6\u7F51\u7EDC\u5F00\u9500\u76F4\u901A\uFF09\uFF1B\u663E\u5F0F\u6307\u5B9A\u89E3\u6790\u5931\u8D25\u62A5\u9519\u4E0D\u515C\u5E95\uFF1B\u7F3A\u7701\u94FE\uFF1A\u672A\u4F20\u6216\u7A7A\u4E32\u65F6\u6309\u5DE5\u4F5C\u533A defaultProject \u89E3\u6790\uFF0C\u65E0\u914D\u7F6E\u6216\u89E3\u6790\u5931\u8D25\u65F6\u6309 key=default\uFF1B\u5F55\u5165\u540E source=mcp)\uFF1Bquery(\u53EF\u9009 view=open|all\u2014\u2014\u7F3A\u7701 open=\u6709\u6548\u672A\u8DDF\u8FDB\u5B8C\uFF0Call=\u5168\u91CF\uFF1Bstatus \u8FC7\u6EE4\u2014\u2014\u663E\u5F0F\u6307\u5B9A\u65F6\u4F18\u5148\u4E8E view\uFF0C\u53EF\u67E5\u5DF2\u53D6\u6D88/\u5DF2\u5B8C\u7ED3\uFF1BtaskId=\u4EFB\u52A1\u53CD\u67E5\uFF1BprojectId/page\u22651/limit 1-500\uFF1B\u54CD\u5E94 items \u542B progress {done,cancelled,total})\u3002\u8C03\u7528\u65B9\u5E94\u5728 fieldMask \u4E2D\u5217\u51FA\u672C\u6B21\u771F\u5B9E\u63D0\u4F9B\u7684\u53EF\u9009\u5B57\u6BB5\uFF0Cmask \u5916\u7531\u5BBF\u4E3B\u81EA\u52A8\u586B\u5145\u7684\u7A7A\u4E32\u3001\u7A7A\u6570\u7EC4\u3001false\u30010 \u5747\u5FFD\u7565\uFF1B\u5404 action \u56FA\u5B9A\u5FC5\u586B\u5B57\u6BB5\u65E0\u9700\u5199\u5165 mask\u3002`,
+    `\u95EE\u9898\u6C60\u5DE5\u5177\uFF08T202609150002\uFF09\uFF1A\u5C0F\u95EE\u9898\u4F4E\u6210\u672C\u5165\u6C60\uFF0C\u6C89\u6DC0\u540E\u7EDF\u4E00\u6574\u7406\u8F6C\u4EFB\u52A1\uFF08\u8F6C\u4EFB\u52A1/\u6574\u7406\u91CD\u4EA4\u4E92\u8D70 CLI siming issue convert \u6216 Web\uFF0C\u4E0D\u5728\u672C\u5DE5\u5177\u9762\uFF09\u3002action\uFF1Acreate(title \u5FC5\u586B 1-200 \u5B57\uFF1B\u53EF\u9009 description\u3001projectId\u2014\u2014key|id \u53CC\u5F62\u6001\uFF0C\u901A\u9053\u5C42\u81EA\u52A8\u5F52\u4E00\u4E3A 24-hex id\uFF08hex \u96F6\u7F51\u7EDC\u5F00\u9500\u76F4\u901A\uFF09\uFF1B\u663E\u5F0F\u6307\u5B9A\u89E3\u6790\u5931\u8D25\u62A5\u9519\u4E0D\u515C\u5E95\uFF1B\u7F3A\u7701\u94FE\uFF1A\u672A\u4F20\u6216\u7A7A\u4E32\u65F6\u6309\u5DE5\u4F5C\u533A defaultProject \u89E3\u6790\uFF08\u5931\u6548\u62A5\u9519\uFF09\uFF0C\u65E0\u914D\u7F6E\u65F6\u4E0D\u4F20 projectId \u7531 server \u6309 key=default \u515C\u5E95\uFF1B\u5F55\u5165\u540E source=mcp)\uFF1Bquery(\u53EF\u9009 view=open|all\u2014\u2014\u7F3A\u7701 open=\u6709\u6548\u672A\u8DDF\u8FDB\u5B8C\uFF0Call=\u5168\u91CF\uFF1Bstatus \u8FC7\u6EE4\u2014\u2014\u663E\u5F0F\u6307\u5B9A\u65F6\u4F18\u5148\u4E8E view\uFF0C\u53EF\u67E5\u5DF2\u53D6\u6D88/\u5DF2\u5B8C\u7ED3\uFF1BtaskId=\u4EFB\u52A1\u53CD\u67E5\uFF1BprojectId\u2014\u2014key|id \u53CC\u5F62\u6001\uFF0C\u901A\u9053\u5C42\u81EA\u52A8\u5F52\u4E00\uFF0C\u7A7A/\u672A\u4F20\u4E0D\u8FC7\u6EE4\uFF08\u663E\u5F0F\u89E3\u6790\u5931\u8D25\u62A5\u9519\uFF09\uFF1Bpage\u22651/limit 1-500\uFF1B\u54CD\u5E94 items \u542B progress {done,cancelled,total})\u3002\u8C03\u7528\u65B9\u5E94\u5728 fieldMask \u4E2D\u5217\u51FA\u672C\u6B21\u771F\u5B9E\u63D0\u4F9B\u7684\u53EF\u9009\u5B57\u6BB5\uFF0Cmask \u5916\u7531\u5BBF\u4E3B\u81EA\u52A8\u586B\u5145\u7684\u7A7A\u4E32\u3001\u7A7A\u6570\u7EC4\u3001false\u30010 \u5747\u5FFD\u7565\uFF1B\u5404 action \u56FA\u5B9A\u5FC5\u586B\u5B57\u6BB5\u65E0\u9700\u5199\u5165 mask\u3002`,
     issueArgs,
     async (rawArgs) => {
       const masked = applyFieldMask(rawArgs, ISSUE_FIELD_SPECS);
@@ -1973,27 +2068,9 @@ function createMcpServer() {
           if (title === void 0) {
             return requireError("create", ["title"], args);
           }
-          let projectId;
-          const explicitProject = args.projectId !== void 0 && args.projectId.trim().length > 0 ? args.projectId : void 0;
-          if (explicitProject !== void 0) {
-            const resolved = await resolveProjectId(client, explicitProject);
-            if (!resolved.success) {
-              return mcpContent({
-                ...resolved,
-                error: {
-                  ...resolved.error,
-                  hint: "MCP \u8C03\u7528\u8BF7\u4F20 projectId \u5B57\u6BB5\uFF08\u9879\u76EE key \u6216 24-hex id \u53CC\u5F62\u6001\uFF0C\u81EA\u52A8\u5F52\u4E00\uFF09\uFF1B\u53EF\u7528 `siming project list` \u67E5\u8BE2\u53EF\u7528\u9879\u76EE"
-                }
-              });
-            }
-            projectId = resolved.data;
-          } else {
-            const wsDefaultProject = readWorkspaceConfig()?.defaultProject;
-            if (wsDefaultProject) {
-              const resolved = await resolveProjectId(client, wsDefaultProject);
-              if (resolved.success) projectId = resolved.data;
-            }
-          }
+          const projectR = await resolveScopedProject(client, args.projectId, "ws-default", { channel: "mcp" });
+          if (!projectR.success) return mcpContent(projectR);
+          const projectId = projectR.data.projectId;
           return mcpContent(
             await handleCreateIssue(client, {
               title,
@@ -2009,12 +2086,18 @@ function createMcpServer() {
           if (args.limit !== void 0 && (args.limit < 1 || args.limit > 500)) {
             return localError("action=query \u7684 limit \u5FC5\u987B\u4E3A 1-500 \u7684\u6574\u6570");
           }
+          let issueQueryProjectId;
+          if (args.projectId !== void 0 && args.projectId.trim().length > 0) {
+            const pr = await resolveScopedProject(client, args.projectId, "explicit-only", { channel: "mcp" });
+            if (!pr.success) return mcpContent(pr);
+            issueQueryProjectId = pr.data.projectId;
+          }
           return mcpContent(
             await handleListIssues(client, {
               view: args.view ?? "open",
               ...args.status !== void 0 ? { status: args.status } : {},
               ...args.taskId !== void 0 ? { taskId: args.taskId } : {},
-              ...args.projectId !== void 0 ? { projectId: args.projectId } : {},
+              ...issueQueryProjectId !== void 0 ? { projectId: issueQueryProjectId } : {},
               ...args.page !== void 0 ? { page: args.page } : {},
               ...args.limit !== void 0 ? { limit: args.limit } : {}
             })
@@ -2236,18 +2319,19 @@ var PAGE_DEFAULT = 20;
 var PAGE_MAX = 500;
 function createTaskCommand() {
   const task = new Command2("task").description("Task management \u2014 create, advance, approve, pause, resume, cancel, reopen, query");
-  withCommonOpts(task.command("list"), "table").option("--status <s>", "filter by status").option("--track <t>", "filter by track").option("--project <key-or-id>", "filter by projectId (key or id)").option("--page <n>", "page number (default 1)", "1").option("--limit <n>", `page size (default ${PAGE_DEFAULT}, max ${PAGE_MAX})`).option("--all", `show all (limit ${PAGE_MAX})`).option("--sort <s>", "sort: progress|createdAt|updatedAt (default progress)").description("List tasks (summary projection: no dagInstance/history payloads)").action(async (opts) => {
+  withCommonOpts(task.command("list"), "table").option("--status <s>", "filter by status").option("--track <t>", "filter by track").option("--project <key|id>", "filter by projectId (key|id)").option("--page <n>", "page number (default 1)", "1").option("--limit <n>", `page size (default ${PAGE_DEFAULT}, max ${PAGE_MAX})`).option("--all", `show all (limit ${PAGE_MAX})`).option("--sort <s>", "sort: progress|createdAt|updatedAt (default progress)").description("List tasks (summary projection: no dagInstance/history payloads)").action(async (opts) => {
     const client = createClient(opts.url);
     const filters = {};
     if (opts.status) filters.status = opts.status;
     if (opts.track) filters.track = opts.track;
-    if (opts.project) {
-      const r = await resolveProjectId(client, opts.project);
-      if (!r.success) {
-        renderResult(opts.format, r);
+    if (opts.project !== void 0 && opts.project.trim().length > 0) {
+      const pr = await resolveScopedProject(client, opts.project, "explicit-only");
+      if (!pr.success) {
+        renderResult(opts.format, pr);
         return;
       }
-      filters.projectId = r.data;
+      const pid = pr.data.projectId;
+      if (pid !== void 0) filters.projectId = pid;
     }
     if (opts.sort) {
       const r = parseEnum(opts.sort, z5.enum(["progress", "createdAt", "updatedAt"]), "sort");
@@ -2303,7 +2387,7 @@ function createTaskCommand() {
     const result = await handleQueryState(client, taskId);
     renderResult(opts.format, result, { fields: result.success ? taskFields(result.data) : [] });
   });
-  task.command("create").description("Create a task from a DAG template").option("--url <url>", "server base URL").requiredOption("--title <t>", "task title").requiredOption("--template <code|name|id>", "DAG template code (preferred), name, or 24-hex id (code/name resolved within project)").requiredOption("--track <t>", "task track (e.g. backend|ui|mixed|research \u2014 research \u4E3A\u8C03\u7814\u7C7B\u578B\u4E13\u7528\uFF0C\u987B\u914D --type research)").option("--type <t>", "task type (feature|bugfix|ui-tweak|research) \u2014 \u7C7B\u578B\u2192\u8DEF\u5F84\u6620\u5C04\u7531 task-create skill \u6301\u6709").option("--skip <ids>", "node ids to prune at creation (comma-separated, repeatable) \u2014 \u53EA\u5141\u8BB8\u6765\u81EA task-create skill \u7684\u6620\u5C04\u77E9\u9635", collectArgs, []).option("--project <key-or-id>", "projectId (key or id; defaults to workspace defaultProject then template projectId)").action(async (opts) => {
+  task.command("create").description("Create a task from a DAG template").option("--url <url>", "server base URL").requiredOption("--title <t>", "task title").requiredOption("--template <code|name|id>", "DAG template code (preferred), name, or 24-hex id (code/name resolved within project)").requiredOption("--track <t>", "task track (e.g. backend|ui|mixed|research \u2014 research \u4E3A\u8C03\u7814\u7C7B\u578B\u4E13\u7528\uFF0C\u987B\u914D --type research)").option("--type <t>", "task type (feature|bugfix|ui-tweak|research) \u2014 \u7C7B\u578B\u2192\u8DEF\u5F84\u6620\u5C04\u7531 task-create skill \u6301\u6709").option("--skip <ids>", "node ids to prune at creation (comma-separated, repeatable) \u2014 \u53EA\u5141\u8BB8\u6765\u81EA task-create skill \u7684\u6620\u5C04\u77E9\u9635", collectArgs, []).option("--project <key|id>", "projectId (key|id; defaults to workspace defaultProject then template projectId)").action(async (opts) => {
     const client = createClient(opts.url);
     let type;
     if (opts.type !== void 0) {
@@ -2318,21 +2402,12 @@ function createTaskCommand() {
     if (opts.skip !== void 0 && opts.skip.length > 0) {
       skipNodes = [...new Set(opts.skip.flatMap((s) => s.split(",")).map((s) => s.trim()).filter((s) => s.length > 0))];
     }
-    let projectId;
-    if (opts.project) {
-      const r = await resolveProjectId(client, opts.project);
-      if (!r.success) {
-        renderResult("json", r);
-        return;
-      }
-      projectId = r.data;
-    } else {
-      const wsDefaultProject = readWorkspaceConfig()?.defaultProject;
-      if (wsDefaultProject) {
-        const r = await resolveProjectId(client, wsDefaultProject);
-        if (r.success) projectId = r.data;
-      }
+    const projectR = await resolveScopedProject(client, opts.project, "ws-default", { commandLabel: "siming task create" });
+    if (!projectR.success) {
+      renderResult("json", projectR);
+      return;
     }
+    const projectId = projectR.data.projectId;
     let templateRef = opts.template;
     if (!/^[0-9a-f]{24}$/.test(templateRef)) {
       const listR = await handleListTemplates(client, projectId);
@@ -2351,20 +2426,9 @@ function createTaskCommand() {
       ...skipNodes !== void 0 && skipNodes.length > 0 ? { skipNodes } : {},
       ...projectId ? { projectId } : {}
     });
-    if (!result.success && !opts.project) {
-      const bizCode = result.error.bizCode;
-      if (bizCode === "PROJECT_NOT_FOUND") {
-        renderResult("json", { ...result, error: { ...result.error, hint: "workspace defaultProject \u6307\u5411\u7684\u9879\u76EE\u4E0D\u5B58\u5728\u2014\u2014run `siming config unset defaultProject` or `siming config set defaultProject <key|id>`" } });
-        return;
-      }
-      if (bizCode === "PROJECT_ARCHIVED") {
-        renderResult("json", { ...result, error: { ...result.error, hint: "workspace defaultProject \u6307\u5411\u7684\u9879\u76EE\u5DF2\u5F52\u6863\u2014\u2014run `siming project list --status active` to pick an active project" } });
-        return;
-      }
-      if (bizCode === "TEMPLATE_PROJECT_MISMATCH") {
-        renderResult("json", { ...result, error: { ...result.error, hint: "template belongs to another project\u2014\u2014pass --project <key|id> of the template's project" } });
-        return;
-      }
+    if (!result.success && !opts.project && result.error.bizCode === "TEMPLATE_PROJECT_MISMATCH") {
+      renderResult("json", { ...result, error: { ...result.error, hint: "template belongs to another project\u2014\u2014pass --project <key|id> of the template's project" } });
+      return;
     }
     renderResult("json", result);
   });
@@ -3214,9 +3278,18 @@ async function handleScaffoldSkill(client, input) {
 // src/commands/skill/command.ts
 function createSkillCommand() {
   const skill = new Command3("skill").description("Skill management \u2014 global/project-scoped skills");
-  withCommonOpts(skill.command("list"), "table").option("--project <id>", "filter by projectId").description("List skills").action(async (opts) => {
+  withCommonOpts(skill.command("list"), "table").option("--project <key|id>", "filter by projectId (key|id)").description("List skills").action(async (opts) => {
     const client = createClient(opts.url);
-    const result = await handleListSkills(client, opts.project);
+    let projectId;
+    if (opts.project !== void 0 && opts.project.trim().length > 0) {
+      const pr = await resolveScopedProject(client, opts.project, "explicit-only");
+      if (!pr.success) {
+        renderResult(opts.format, pr);
+        return;
+      }
+      projectId = pr.data.projectId;
+    }
+    const result = await handleListSkills(client, projectId);
     renderResult(opts.format, result, {
       columns: [
         { key: "name", header: "Name" },
@@ -3228,7 +3301,7 @@ function createSkillCommand() {
       ]
     });
   });
-  withCommonOpts(skill.command("show <name>"), "fancy").description("Show skill details").option("--scope <scope>", "global|project (asset addressing; defaults to global)").option("--project-id <hex>", "projectId (required when scope=project)").action(async (name, opts) => {
+  withCommonOpts(skill.command("show <name>"), "fancy").description("Show skill details").option("--scope <scope>", "global|project (asset addressing; defaults to global)").option("--project-id <key|id>", "projectId (scope=project; falls back to workspace/instance default project)").action(async (name, opts) => {
     const client = createClient(opts.url);
     let scope;
     if (opts.scope !== void 0) {
@@ -3239,13 +3312,23 @@ function createSkillCommand() {
       }
       scope = scopeR.data;
     }
+    let projectId;
+    const explicitProject = opts.projectId !== void 0 && opts.projectId.trim().length > 0 ? opts.projectId : void 0;
+    if (explicitProject !== void 0 || scope === "project") {
+      const pr = await resolveScopedProject(client, explicitProject, "instance-default", { commandLabel: "siming skill show" });
+      if (!pr.success) {
+        renderResult(opts.format, pr);
+        return;
+      }
+      projectId = pr.data.projectId;
+    }
     const result = await handleGetSkill(client, name, {
       ...scope !== void 0 ? { scope } : {},
-      ...opts.projectId !== void 0 ? { projectId: opts.projectId } : {}
+      ...projectId !== void 0 ? { projectId } : {}
     });
     renderResult(opts.format, result, { fields: result.success ? skillFields(result.data) : [] });
   });
-  skill.command("create").description("Create a skill (scope required)").option("--url <url>", "server base URL").requiredOption("--name <name>", "skill name (kebab-case)").requiredOption("--description <text>", "skill description").requiredOption("--content <text>", "skill content (prompt body)").requiredOption("--category <cat>", "process|domain|tooling").requiredOption("--scope <scope>", "global|project").option("--ref <path@file>", "reference doc: <relative path>@<local file> (repeatable)", collectArgs, []).option("--project-id <hex>", "projectId (required when scope=project)").action(async (opts) => {
+  skill.command("create").description("Create a skill (scope required)").option("--url <url>", "server base URL").requiredOption("--name <name>", "skill name (kebab-case)").requiredOption("--description <text>", "skill description").requiredOption("--content <text>", "skill content (prompt body)").requiredOption("--category <cat>", "process|domain|tooling").requiredOption("--scope <scope>", "global|project").option("--ref <path@file>", "reference doc: <relative path>@<local file> (repeatable)", collectArgs, []).option("--project-id <key|id>", "projectId (scope=project; falls back to workspace/instance default project)").action(async (opts) => {
     const categoryR = parseEnum(opts.category, SkillCategorySchema, "category");
     if (!categoryR.success) {
       renderResult("json", categoryR);
@@ -3262,6 +3345,16 @@ function createSkillCommand() {
       return;
     }
     const client = createClient(opts.url);
+    let projectId;
+    const explicitProject = opts.projectId !== void 0 && opts.projectId.trim().length > 0 ? opts.projectId : void 0;
+    if (explicitProject !== void 0 || scopeR.data === "project") {
+      const pr = await resolveScopedProject(client, explicitProject, "instance-default", { commandLabel: "siming skill create" });
+      if (!pr.success) {
+        renderResult("json", pr);
+        return;
+      }
+      projectId = pr.data.projectId;
+    }
     const input = {
       name: opts.name,
       description: opts.description,
@@ -3270,12 +3363,12 @@ function createSkillCommand() {
       scope: scopeR.data,
       version: "1.0.0",
       ...refsR.data.length > 0 ? { references: refsR.data } : {},
-      ...opts.projectId ? { projectId: opts.projectId } : {}
+      ...projectId !== void 0 ? { projectId } : {}
     };
     const result = await handleCreateSkill(client, input);
     renderResult("json", result);
   });
-  skill.command("update <name>").description("Update a skill (partial; references untouched unless --ref/--clear-refs given)").option("--url <url>", "server base URL").option("--description <text>", "new description").option("--content <text>", "new content").option("--new-version <v>", "new version (note: --version is reserved for the program version)").option("--scope <scope>", "global|project (asset addressing)").option("--ref <path@file>", "replace all reference docs: <relative path>@<local file> (repeatable)", collectArgs, []).option("--clear-refs", "remove all reference docs (mutually exclusive with --ref)").option("--project-id <hex>", "projectId (required when scope=project)").action(async (name, opts) => {
+  skill.command("update <name>").description("Update a skill (partial; references untouched unless --ref/--clear-refs given)").option("--url <url>", "server base URL").option("--description <text>", "new description").option("--content <text>", "new content").option("--new-version <v>", "new version (note: --version is reserved for the program version)").option("--scope <scope>", "global|project (asset addressing)").option("--ref <path@file>", "replace all reference docs: <relative path>@<local file> (repeatable)", collectArgs, []).option("--clear-refs", "remove all reference docs (mutually exclusive with --ref)").option("--project-id <key|id>", "projectId (scope=project; falls back to workspace/instance default project)").action(async (name, opts) => {
     const client = createClient(opts.url);
     let scope;
     if (opts.scope !== void 0) {
@@ -3305,21 +3398,31 @@ function createSkillCommand() {
       }
       references = refsR.data;
     }
+    let projectId;
+    const explicitProject = opts.projectId !== void 0 && opts.projectId.trim().length > 0 ? opts.projectId : void 0;
+    if (explicitProject !== void 0 || scope === "project") {
+      const pr = await resolveScopedProject(client, explicitProject, "instance-default", { commandLabel: "siming skill update" });
+      if (!pr.success) {
+        renderResult("json", pr);
+        return;
+      }
+      projectId = pr.data.projectId;
+    }
     const patch = {
       ...opts.description !== void 0 ? { description: opts.description } : {},
       ...opts.content !== void 0 ? { content: opts.content } : {},
       ...opts.newVersion !== void 0 ? { version: opts.newVersion } : {},
       ...scope !== void 0 ? { scope } : {},
       ...references !== void 0 ? { references } : {},
-      ...opts.projectId !== void 0 ? { projectId: opts.projectId } : {}
+      ...projectId !== void 0 ? { projectId } : {}
     };
     const result = await handleUpdateSkill(client, name, patch, {
       ...scope !== void 0 ? { scope } : {},
-      ...opts.projectId !== void 0 ? { projectId: opts.projectId } : {}
+      ...projectId !== void 0 ? { projectId } : {}
     });
     renderResult("json", result);
   });
-  skill.command("copy <name>").description("Copy a skill to a new name/scope").option("--url <url>", "server base URL").requiredOption("--new-name <name>", "copy name").requiredOption("--new-scope <scope>", "global|project").option("--target-project-id <hex>", "target projectId (required when newScope=project)").option("--scope <scope>", "source asset addressing: global|project (defaults to global)").option("--source-project-id <hex>", "source projectId (required when scope=project)").action(async (name, opts) => {
+  skill.command("copy <name>").description("Copy a skill to a new name/scope").option("--url <url>", "server base URL").requiredOption("--new-name <name>", "copy name").requiredOption("--new-scope <scope>", "global|project").option("--target-project-id <key|id>", "target projectId (newScope=project; falls back to workspace/instance default project)").option("--scope <scope>", "source asset addressing: global|project (defaults to global)").option("--source-project-id <key|id>", "source projectId (scope=project; falls back to workspace/instance default project)").action(async (name, opts) => {
     const scopeR = parseEnum(opts.newScope, SkillScopeSchema, "new-scope");
     if (!scopeR.success) {
       renderResult("json", scopeR);
@@ -3335,22 +3438,42 @@ function createSkillCommand() {
       srcScope = srcR.data;
     }
     const client = createClient(opts.url);
+    let targetProjectId;
+    const explicitTarget = opts.targetProjectId !== void 0 && opts.targetProjectId.trim().length > 0 ? opts.targetProjectId : void 0;
+    if (explicitTarget !== void 0 || scopeR.data === "project") {
+      const pr = await resolveScopedProject(client, explicitTarget, "instance-default", { commandLabel: "siming skill copy (target)" });
+      if (!pr.success) {
+        renderResult("json", pr);
+        return;
+      }
+      targetProjectId = pr.data.projectId;
+    }
+    let sourceProjectId;
+    const explicitSource = opts.sourceProjectId !== void 0 && opts.sourceProjectId.trim().length > 0 ? opts.sourceProjectId : void 0;
+    if (explicitSource !== void 0 || srcScope === "project") {
+      const pr = await resolveScopedProject(client, explicitSource, "instance-default", { commandLabel: "siming skill copy (source)" });
+      if (!pr.success) {
+        renderResult("json", pr);
+        return;
+      }
+      sourceProjectId = pr.data.projectId;
+    }
     const result = await handleCopySkill(
       client,
       name,
       {
         newName: opts.newName,
         newScope: scopeR.data,
-        ...opts.targetProjectId ? { targetProjectId: opts.targetProjectId } : {}
+        ...targetProjectId !== void 0 ? { targetProjectId } : {}
       },
       {
         ...srcScope !== void 0 ? { scope: srcScope } : {},
-        ...opts.sourceProjectId !== void 0 ? { projectId: opts.sourceProjectId } : {}
+        ...sourceProjectId !== void 0 ? { projectId: sourceProjectId } : {}
       }
     );
     renderResult("json", result);
   });
-  withCommonOpts(skill.command("delete <name>"), "fancy").description("Delete a skill").option("--scope <scope>", "global|project (asset addressing; defaults to global)").option("--project-id <hex>", "projectId (required when scope=project)").action(async (name, opts) => {
+  withCommonOpts(skill.command("delete <name>"), "fancy").description("Delete a skill").option("--scope <scope>", "global|project (asset addressing; defaults to global)").option("--project-id <key|id>", "projectId (scope=project; falls back to workspace/instance default project)").action(async (name, opts) => {
     const client = createClient(opts.url);
     let scope;
     if (opts.scope !== void 0) {
@@ -3361,13 +3484,23 @@ function createSkillCommand() {
       }
       scope = scopeR.data;
     }
+    let projectId;
+    const explicitProject = opts.projectId !== void 0 && opts.projectId.trim().length > 0 ? opts.projectId : void 0;
+    if (explicitProject !== void 0 || scope === "project") {
+      const pr = await resolveScopedProject(client, explicitProject, "instance-default", { commandLabel: "siming skill delete" });
+      if (!pr.success) {
+        renderResult("json", pr);
+        return;
+      }
+      projectId = pr.data.projectId;
+    }
     const result = await handleDeleteSkill(client, name, {
       ...scope !== void 0 ? { scope } : {},
-      ...opts.projectId !== void 0 ? { projectId: opts.projectId } : {}
+      ...projectId !== void 0 ? { projectId } : {}
     });
     renderResult(opts.format, result, { successMessage: `deleted skill '${name}'` });
   });
-  skill.command("enabled <name> <on|off>").description("Enable/disable a skill (asset addressing; defaults to global)").option("--url <url>", "server base URL").option("--format <fmt>", "output format: fancy|table|json", "fancy").option("--scope <scope>", "global|project (asset addressing; defaults to global)").option("--project-id <hex>", "projectId (required when scope=project)").action(async (name, onOff, opts) => {
+  skill.command("enabled <name> <on|off>").description("Enable/disable a skill (asset addressing; defaults to global)").option("--url <url>", "server base URL").option("--format <fmt>", "output format: fancy|table|json", "fancy").option("--scope <scope>", "global|project (asset addressing; defaults to global)").option("--project-id <key|id>", "projectId (scope=project; falls back to workspace/instance default project)").action(async (name, onOff, opts) => {
     const enabledR = parseOnOff(onOff);
     if (!enabledR.success) {
       renderResult(opts.format, enabledR);
@@ -3383,9 +3516,19 @@ function createSkillCommand() {
       }
       scope = scopeR.data;
     }
+    let projectId;
+    const explicitProject = opts.projectId !== void 0 && opts.projectId.trim().length > 0 ? opts.projectId : void 0;
+    if (explicitProject !== void 0 || scope === "project") {
+      const pr = await resolveScopedProject(client, explicitProject, "instance-default", { commandLabel: "siming skill enabled" });
+      if (!pr.success) {
+        renderResult(opts.format, pr);
+        return;
+      }
+      projectId = pr.data.projectId;
+    }
     const result = await handleSetSkillEnabled(client, name, enabledR.data, {
       ...scope !== void 0 ? { scope } : {},
-      ...opts.projectId !== void 0 ? { projectId: opts.projectId } : {}
+      ...projectId !== void 0 ? { projectId } : {}
     });
     renderResult(opts.format, result, {
       successMessage: `skill '${name}' ${enabledR.data ? "enabled" : "disabled"}`
@@ -3393,16 +3536,17 @@ function createSkillCommand() {
   });
   skill.command("scaffold <template>").description(
     "Scaffold an official project-scoped skill from the packaged skeleton (task-create entry; same-name conflict refused by default)"
-  ).option("--url <url>", "server base URL").requiredOption("--project <key-or-id>", "target project (key or 24-hex id)").option("--overwrite", "explicitly replace an existing same-name project asset (version bumps monotonically; enabled state untouched)").option("--format <fmt>", "output format: fancy|table|json", "fancy").action(async (template, opts) => {
+  ).option("--url <url>", "server base URL").option("--project <key|id>", "target project (key|id; falls back to workspace/instance default project)").option("--overwrite", "explicitly replace an existing same-name project asset (version bumps monotonically; enabled state untouched)").option("--format <fmt>", "output format: fancy|table|json", "fancy").action(async (template, opts) => {
     const client = createClient(opts.url);
-    const projectR = await resolveProjectId(client, opts.project);
+    const projectR = await resolveScopedProject(client, opts.project, "instance-default", { commandLabel: "siming skill scaffold" });
     if (!projectR.success) {
       renderResult(opts.format, projectR);
       return;
     }
     const result = await handleScaffoldSkill(client, {
       template,
-      projectId: projectR.data,
+      projectId: projectR.data.projectId,
+      // instance-default 成功必含 id
       ...opts.overwrite === true ? { overwrite: true } : {}
     });
     const renderOptions = result.success ? {
@@ -3493,9 +3637,18 @@ async function handleDeleteAgent(client, name, query = {}) {
 // src/commands/agent/command.ts
 function createAgentCommand() {
   const agent = new Command4("agent").description("Agent management \u2014 subagent definitions (global/project scope)");
-  withCommonOpts(agent.command("list"), "table").option("--project <id>", "filter by projectId").description("List agents").action(async (opts) => {
+  withCommonOpts(agent.command("list"), "table").option("--project <key|id>", "filter by projectId (key|id)").description("List agents").action(async (opts) => {
     const client = createClient(opts.url);
-    const result = await handleListAgents(client, opts.project);
+    let projectId;
+    if (opts.project !== void 0 && opts.project.trim().length > 0) {
+      const pr = await resolveScopedProject(client, opts.project, "explicit-only");
+      if (!pr.success) {
+        renderResult(opts.format, pr);
+        return;
+      }
+      projectId = pr.data.projectId;
+    }
+    const result = await handleListAgents(client, projectId);
     renderResult(opts.format, result, {
       columns: [
         { key: "name", header: "Name" },
@@ -3513,7 +3666,7 @@ function createAgentCommand() {
     const result = await handleGetAgent(client, name);
     renderResult(opts.format, result, { fields: result.success ? agentFields(result.data) : [] });
   });
-  agent.command("create").description("Create an agent (scope + system-prompt + model required)").option("--url <url>", "server base URL").requiredOption("--name <name>", "agent name").requiredOption("--description <text>", "agent description").requiredOption("--system-prompt <text>", "system prompt").requiredOption("--model <code>", "model siming-code (kebab-case)").requiredOption("--scope <scope>", "global|project").option("--function <function>", "agent function: reviewer|executor (default executor)").option("--bound-skill <name>", "bound skill name (repeatable)", collectArgs, []).option("--tool <name>", "tool name (repeatable)", collectArgs, []).option("--permission <name>", "permission name (repeatable)", collectArgs, []).option("--ref <path@file>", "reference doc: <relative path>@<local file> (repeatable)", collectArgs, []).option("--project-id <hex>", "projectId (required when scope=project)").action(async (opts) => {
+  agent.command("create").description("Create an agent (scope + system-prompt + model required)").option("--url <url>", "server base URL").requiredOption("--name <name>", "agent name").requiredOption("--description <text>", "agent description").requiredOption("--system-prompt <text>", "system prompt").requiredOption("--model <code>", "model siming-code (kebab-case)").requiredOption("--scope <scope>", "global|project").option("--function <function>", "agent function: reviewer|executor (default executor)").option("--bound-skill <name>", "bound skill name (repeatable)", collectArgs, []).option("--tool <name>", "tool name (repeatable)", collectArgs, []).option("--permission <name>", "permission name (repeatable)", collectArgs, []).option("--ref <path@file>", "reference doc: <relative path>@<local file> (repeatable)", collectArgs, []).option("--project-id <key|id>", "projectId (scope=project; falls back to workspace/instance default project)").action(async (opts) => {
     const scopeR = parseEnum(opts.scope, AgentScopeSchema, "scope");
     if (!scopeR.success) {
       renderResult("json", scopeR);
@@ -3534,6 +3687,16 @@ function createAgentCommand() {
       return;
     }
     const client = createClient(opts.url);
+    let projectId;
+    const explicitProject = opts.projectId !== void 0 && opts.projectId.trim().length > 0 ? opts.projectId : void 0;
+    if (explicitProject !== void 0 || scopeR.data === "project") {
+      const pr = await resolveScopedProject(client, explicitProject, "instance-default", { commandLabel: "siming agent create" });
+      if (!pr.success) {
+        renderResult("json", pr);
+        return;
+      }
+      projectId = pr.data.projectId;
+    }
     const input = {
       name: opts.name,
       description: opts.description,
@@ -3547,12 +3710,12 @@ function createAgentCommand() {
       tools: opts.tool,
       permissions: opts.permission,
       ...refsR.data.length > 0 ? { references: refsR.data } : {},
-      ...opts.projectId ? { projectId: opts.projectId } : {}
+      ...projectId !== void 0 ? { projectId } : {}
     };
     const result = await handleCreateAgent(client, input);
     renderResult("json", result);
   });
-  agent.command("update <name>").description("Update an agent (partial)").option("--url <url>", "server base URL").option("--description <text>", "new description").option("--system-prompt <text>", "new system prompt").option("--model <code>", "new model siming-code").option("--scope <scope>", "global|project (asset addressing)").option("--function <function>", "new agent function: reviewer|executor").option("--bound-skill <name>", "replace bound skills (repeatable)", collectArgs, []).option("--tool <name>", "replace tools (repeatable)", collectArgs, []).option("--permission <name>", "replace permissions (repeatable)", collectArgs, []).option("--ref <path@file>", "replace all reference docs: <relative path>@<local file> (repeatable)", collectArgs, []).option("--clear-refs", "remove all reference docs (mutually exclusive with --ref)").option("--project-id <hex>", "projectId (required when scope=project)").action(async (name, opts) => {
+  agent.command("update <name>").description("Update an agent (partial)").option("--url <url>", "server base URL").option("--description <text>", "new description").option("--system-prompt <text>", "new system prompt").option("--model <code>", "new model siming-code").option("--scope <scope>", "global|project (asset addressing)").option("--function <function>", "new agent function: reviewer|executor").option("--bound-skill <name>", "replace bound skills (repeatable)", collectArgs, []).option("--tool <name>", "replace tools (repeatable)", collectArgs, []).option("--permission <name>", "replace permissions (repeatable)", collectArgs, []).option("--ref <path@file>", "replace all reference docs: <relative path>@<local file> (repeatable)", collectArgs, []).option("--clear-refs", "remove all reference docs (mutually exclusive with --ref)").option("--project-id <key|id>", "projectId (scope=project; falls back to workspace/instance default project)").action(async (name, opts) => {
     const client = createClient(opts.url);
     let scope;
     if (opts.scope !== void 0) {
@@ -3591,6 +3754,16 @@ function createAgentCommand() {
       }
       references = refsR.data;
     }
+    let projectId;
+    const explicitProject = opts.projectId !== void 0 && opts.projectId.trim().length > 0 ? opts.projectId : void 0;
+    if (explicitProject !== void 0 || scope === "project") {
+      const pr = await resolveScopedProject(client, explicitProject, "instance-default", { commandLabel: "siming agent update" });
+      if (!pr.success) {
+        renderResult("json", pr);
+        return;
+      }
+      projectId = pr.data.projectId;
+    }
     const patch = {
       ...opts.description !== void 0 ? { description: opts.description } : {},
       ...opts.systemPrompt !== void 0 ? { systemPrompt: opts.systemPrompt } : {},
@@ -3601,15 +3774,15 @@ function createAgentCommand() {
       ...opts.tool.length > 0 ? { tools: opts.tool } : {},
       ...opts.permission.length > 0 ? { permissions: opts.permission } : {},
       ...references !== void 0 ? { references } : {},
-      ...opts.projectId !== void 0 ? { projectId: opts.projectId } : {}
+      ...projectId !== void 0 ? { projectId } : {}
     };
     const result = await handleUpdateAgent(client, name, patch, {
       ...scope !== void 0 ? { scope } : {},
-      ...opts.projectId !== void 0 ? { projectId: opts.projectId } : {}
+      ...projectId !== void 0 ? { projectId } : {}
     });
     renderResult("json", result);
   });
-  agent.command("copy <name>").description("Copy an agent to a new name/scope").option("--url <url>", "server base URL").requiredOption("--new-name <name>", "copy name").requiredOption("--new-scope <scope>", "global|project").option("--target-project-id <hex>", "target projectId (required when newScope=project)").option("--scope <scope>", "source asset addressing: global|project (defaults to global)").option("--source-project-id <hex>", "source projectId (required when scope=project)").action(async (name, opts) => {
+  agent.command("copy <name>").description("Copy an agent to a new name/scope").option("--url <url>", "server base URL").requiredOption("--new-name <name>", "copy name").requiredOption("--new-scope <scope>", "global|project").option("--target-project-id <key|id>", "target projectId (newScope=project; falls back to workspace/instance default project)").option("--scope <scope>", "source asset addressing: global|project (defaults to global)").option("--source-project-id <key|id>", "source projectId (scope=project; falls back to workspace/instance default project)").action(async (name, opts) => {
     const scopeR = parseEnum(opts.newScope, AgentScopeSchema, "new-scope");
     if (!scopeR.success) {
       renderResult("json", scopeR);
@@ -3625,22 +3798,42 @@ function createAgentCommand() {
       srcScope = srcR.data;
     }
     const client = createClient(opts.url);
+    let targetProjectId;
+    const explicitTarget = opts.targetProjectId !== void 0 && opts.targetProjectId.trim().length > 0 ? opts.targetProjectId : void 0;
+    if (explicitTarget !== void 0 || scopeR.data === "project") {
+      const pr = await resolveScopedProject(client, explicitTarget, "instance-default", { commandLabel: "siming agent copy (target)" });
+      if (!pr.success) {
+        renderResult("json", pr);
+        return;
+      }
+      targetProjectId = pr.data.projectId;
+    }
+    let sourceProjectId;
+    const explicitSource = opts.sourceProjectId !== void 0 && opts.sourceProjectId.trim().length > 0 ? opts.sourceProjectId : void 0;
+    if (explicitSource !== void 0 || srcScope === "project") {
+      const pr = await resolveScopedProject(client, explicitSource, "instance-default", { commandLabel: "siming agent copy (source)" });
+      if (!pr.success) {
+        renderResult("json", pr);
+        return;
+      }
+      sourceProjectId = pr.data.projectId;
+    }
     const result = await handleCopyAgent(
       client,
       name,
       {
         newName: opts.newName,
         newScope: scopeR.data,
-        ...opts.targetProjectId ? { targetProjectId: opts.targetProjectId } : {}
+        ...targetProjectId !== void 0 ? { targetProjectId } : {}
       },
       {
         ...srcScope !== void 0 ? { scope: srcScope } : {},
-        ...opts.sourceProjectId !== void 0 ? { projectId: opts.sourceProjectId } : {}
+        ...sourceProjectId !== void 0 ? { projectId: sourceProjectId } : {}
       }
     );
     renderResult("json", result);
   });
-  withCommonOpts(agent.command("delete <name>"), "fancy").description("Delete an agent").option("--scope <scope>", "global|project (asset addressing; defaults to global)").option("--project-id <hex>", "projectId (required when scope=project)").action(async (name, opts) => {
+  withCommonOpts(agent.command("delete <name>"), "fancy").description("Delete an agent").option("--scope <scope>", "global|project (asset addressing; defaults to global)").option("--project-id <key|id>", "projectId (scope=project; falls back to workspace/instance default project)").action(async (name, opts) => {
     const client = createClient(opts.url);
     let scope;
     if (opts.scope !== void 0) {
@@ -3651,9 +3844,19 @@ function createAgentCommand() {
       }
       scope = scopeR.data;
     }
+    let projectId;
+    const explicitProject = opts.projectId !== void 0 && opts.projectId.trim().length > 0 ? opts.projectId : void 0;
+    if (explicitProject !== void 0 || scope === "project") {
+      const pr = await resolveScopedProject(client, explicitProject, "instance-default", { commandLabel: "siming agent delete" });
+      if (!pr.success) {
+        renderResult(opts.format, pr);
+        return;
+      }
+      projectId = pr.data.projectId;
+    }
     const result = await handleDeleteAgent(client, name, {
       ...scope !== void 0 ? { scope } : {},
-      ...opts.projectId !== void 0 ? { projectId: opts.projectId } : {}
+      ...projectId !== void 0 ? { projectId } : {}
     });
     renderResult(opts.format, result, { successMessage: `deleted agent '${name}'` });
   });
@@ -3684,23 +3887,13 @@ function createDagCommand() {
   const tpl = dag.command("template").description("DAG template management");
   withCommonOpts(tpl.command("list"), "table").option("--project <key|id>", "filter by project (key or id; defaults to workspace defaultProject)").description("List DAG templates (summary projection: node labels only, no prompts \u2014 use `show` for full detail)").action(async (opts) => {
     const client = createClient(opts.url);
-    const projectOpt = opts.project ?? readWorkspaceConfig()?.defaultProject;
-    let projectId;
-    if (projectOpt !== void 0) {
-      const r = await resolveProjectId(client, projectOpt);
-      if (!r.success) {
-        if (opts.project === void 0) {
-          renderResult(opts.format, fail({
-            ...r.error,
-            hint: `workspace defaultProject "${projectOpt}" \u89E3\u6790\u5931\u8D25\u2014\u2014siming config unset defaultProject \u540E\u91CD\u8BD5\uFF0C\u6216\u663E\u5F0F --project <key|id>`
-          }));
-        } else {
-          renderResult(opts.format, r);
-        }
-        return;
-      }
-      projectId = r.data;
+    const explicitProject = opts.project !== void 0 && opts.project.trim().length > 0 ? opts.project : void 0;
+    const pr = await resolveScopedProject(client, explicitProject, "ws-default", { commandLabel: "siming dag template list" });
+    if (!pr.success) {
+      renderResult(opts.format, pr);
+      return;
     }
+    const projectId = pr.data.projectId;
     const result = await handleListTemplates(client, projectId);
     if (!result.success) {
       renderResult(opts.format, result);
@@ -3728,15 +3921,13 @@ function createDagCommand() {
     const client = createClient(opts.url);
     let projectId;
     if (!/^[a-f0-9]{24}$/.test(templateRef)) {
-      const projectOpt = opts.project ?? readWorkspaceConfig()?.defaultProject;
-      if (projectOpt !== void 0) {
-        const r = await resolveProjectId(client, projectOpt);
-        if (!r.success) {
-          renderResult("json", r);
-          return;
-        }
-        projectId = r.data;
+      const explicitProject = opts.project !== void 0 && opts.project.trim().length > 0 ? opts.project : void 0;
+      const pr = await resolveScopedProject(client, explicitProject, "ws-default", { commandLabel: "siming dag template show" });
+      if (!pr.success) {
+        renderResult(opts.format, pr);
+        return;
       }
+      projectId = pr.data.projectId;
     }
     const result = await handleGetTemplate(client, templateRef, projectId);
     renderResult(opts.format, result, { fields: result.success ? templateFields(result.data) : [] });
@@ -3903,13 +4094,15 @@ async function runYamlImport(client, yamlText, opts, jsonParseError2) {
     return;
   }
   let projectId;
-  if (opts.project !== void 0) {
-    const r = await resolveProjectId(client, opts.project);
+  if (opts.project !== void 0 && opts.project.trim().length > 0) {
+    const r = await resolveScopedProject(client, opts.project, "explicit-only", {
+      commandLabel: "siming dag template import"
+    });
     if (!r.success) {
       renderResult("json", r);
       return;
     }
-    projectId = r.data;
+    projectId = r.data.projectId;
   }
   const result = await importTemplateFromYaml(client, yamlText, {
     ...projectId !== void 0 ? { projectId } : {},
@@ -3969,13 +4162,15 @@ async function runBundleImport(client, bundleText, opts) {
     }));
     return;
   }
-  const target = await resolveImportTargetProject(client, opts.project);
-  if (!target.success) {
-    renderResult("json", target);
+  const explicitBundleTarget = opts.project !== void 0 && opts.project.trim().length > 0 ? opts.project : void 0;
+  const pr = await resolveScopedProject(client, explicitBundleTarget, "instance-default", { commandLabel: "siming dag template import" });
+  if (!pr.success) {
+    renderResult("json", pr);
     return;
   }
   const result = await importTemplateBundle(client, bundleText, {
-    targetProjectId: target.data,
+    targetProjectId: pr.data.projectId,
+    // instance-default 成功必含 id
     ...opts.overwriteDeps === true ? { overwriteDeps: true } : {},
     ...opts.plan === true ? { planOnly: true } : {}
   });
@@ -3985,31 +4180,6 @@ async function runBundleImport(client, bundleText, opts) {
   }
   renderBundleImportOutcome(result.data, opts.plan === true);
 }
-async function resolveImportTargetProject(client, projectOpt) {
-  if (projectOpt !== void 0) return resolveProjectId(client, projectOpt);
-  const wsDefault = readWorkspaceConfig()?.defaultProject;
-  if (wsDefault !== void 0) {
-    const r = await resolveProjectId(client, wsDefault);
-    if (!r.success) {
-      return fail({
-        ...r.error,
-        hint: `workspace defaultProject "${wsDefault}" \u89E3\u6790\u5931\u8D25\u2014\u2014siming config unset defaultProject \u540E\u91CD\u8BD5\uFF0C\u6216\u663E\u5F0F --project <key|id>`
-      });
-    }
-    return r;
-  }
-  const list = await handleListProjects(client);
-  if (!list.success) return list;
-  const defaultProject = list.data.find((p) => p.key === "default");
-  if (defaultProject?.id === void 0) {
-    return fail({
-      message: "bundle \u5BFC\u5165\u9700\u8981\u76EE\u6807\u9879\u76EE\uFF1A\u672A\u6307\u5B9A --project\uFF0C\u5DE5\u4F5C\u533A\u65E0 defaultProject\uFF0C\u5B9E\u4F8B\u4E2D\u4E5F\u65E0 key=default \u7684\u9879\u76EE",
-      httpStatus: 0,
-      hint: "pass --project <key|id>\uFF0C\u6216\u5148 siming project create + siming init --project <key>"
-    });
-  }
-  return { success: true, data: defaultProject.id };
-}
 function renderBundleImportOutcome(outcome, planOnly) {
   const t = outcome.plan.template;
   const overwritten = t.willOverwrite && t.currentVersion !== void 0 ? `\u8986\u76D6\u73B0\u6709 v${t.currentVersion} \u2192 ` : "";
@@ -4284,7 +4454,7 @@ ${failures.join("\n")}`,
 // src/commands/node/command.ts
 function createNodeCommand() {
   const node = new Command6("node").description("NodePreset management \u2014 reusable DAG node assets (addressed by unique code)");
-  withCommonOpts(node.command("list"), "table").option("--project <id>", "overlay visible set: global + this project").option("--scope <scope>", "exact scope filter: global|project").option("--q <keyword>", "search in code/label").description("List node presets (summary projection: no prompt \u2014 use `show` for full detail)").action(async (opts) => {
+  withCommonOpts(node.command("list"), "table").option("--project <key|id>", "overlay visible set: global + this project (key|id)").option("--scope <scope>", "exact scope filter: global|project").option("--q <keyword>", "search in code/label").description("List node presets (summary projection: no prompt \u2014 use `show` for full detail)").action(async (opts) => {
     let scope;
     if (opts.scope !== void 0) {
       const scopeR = parseEnum(opts.scope, SkillScopeSchema2, "scope");
@@ -4295,8 +4465,17 @@ function createNodeCommand() {
       scope = scopeR.data;
     }
     const client = createClient(opts.url);
+    let projectId;
+    if (opts.project !== void 0 && opts.project.trim().length > 0) {
+      const pr = await resolveScopedProject(client, opts.project, "explicit-only");
+      if (!pr.success) {
+        renderResult(opts.format, pr);
+        return;
+      }
+      projectId = pr.data.projectId;
+    }
     const result = await handleListNodePresets(client, {
-      ...opts.project !== void 0 ? { projectId: opts.project } : {},
+      ...projectId !== void 0 ? { projectId } : {},
       ...scope !== void 0 ? { scope } : {},
       ...opts.q !== void 0 ? { q: opts.q } : {}
     });
@@ -4319,7 +4498,7 @@ function createNodeCommand() {
     const result = await handleGetNodePreset(client, code);
     renderResult(opts.format, result, { fields: result.success ? nodeFields2(result.data) : [] });
   });
-  node.command("create").description("Create a node preset (code globally unique & immutable; scope required)").option("--url <url>", "server base URL").requiredOption("--code <code>", "unique business code (kebab-case, immutable)").requiredOption("--label <text>", "display label").requiredOption("--node-id <id>", "default node id when assembled into templates ([A-Za-z0-9_-]+)").requiredOption("--phase <phase>", "node phase (e.g. entry|track|test|exit)").requiredOption("--track <track>", "node track (backend|ui|all)").requiredOption("--prompt <text>", "node prompt body").option("--prompt-file <path>", "read prompt from file (overrides --prompt)").option("--skill <name>", "bound skill name (repeatable)", collectArgs, []).option("--agent <name>", "callable agent name (repeatable)", collectArgs, []).option("--description <text>", "asset description").requiredOption("--scope <scope>", "global|project").option("--project-id <hex>", "projectId (required when scope=project)").action(async (opts) => {
+  node.command("create").description("Create a node preset (code globally unique & immutable; scope required)").option("--url <url>", "server base URL").requiredOption("--code <code>", "unique business code (kebab-case, immutable)").requiredOption("--label <text>", "display label").requiredOption("--node-id <id>", "default node id when assembled into templates ([A-Za-z0-9_-]+)").requiredOption("--phase <phase>", "node phase (e.g. entry|track|test|exit)").requiredOption("--track <track>", "node track (backend|ui|all)").requiredOption("--prompt <text>", "node prompt body").option("--prompt-file <path>", "read prompt from file (overrides --prompt)").option("--skill <name>", "bound skill name (repeatable)", collectArgs, []).option("--agent <name>", "callable agent name (repeatable)", collectArgs, []).option("--description <text>", "asset description").requiredOption("--scope <scope>", "global|project").option("--project-id <key|id>", "projectId (scope=project; falls back to workspace/instance default project)").action(async (opts) => {
     const scopeR = parseEnum(opts.scope, SkillScopeSchema2, "scope");
     if (!scopeR.success) {
       renderResult("json", scopeR);
@@ -4342,6 +4521,16 @@ function createNodeCommand() {
       return;
     }
     const client = createClient(opts.url);
+    let projectId;
+    const explicitProject = opts.projectId !== void 0 && opts.projectId.trim().length > 0 ? opts.projectId : void 0;
+    if (explicitProject !== void 0 || scopeR.data === "project") {
+      const pr = await resolveScopedProject(client, explicitProject, "instance-default", { commandLabel: "siming node create" });
+      if (!pr.success) {
+        renderResult("json", pr);
+        return;
+      }
+      projectId = pr.data.projectId;
+    }
     const input = {
       code: opts.code,
       label: opts.label,
@@ -4354,7 +4543,7 @@ function createNodeCommand() {
       scope: scopeR.data,
       version: "1.0.0",
       ...opts.description !== void 0 ? { description: opts.description } : {},
-      ...opts.projectId !== void 0 ? { projectId: opts.projectId } : {}
+      ...projectId !== void 0 ? { projectId } : {}
     };
     renderResult("json", await handleCreateNodePreset(client, input));
   });
@@ -4399,17 +4588,27 @@ function createNodeCommand() {
     }
     renderResult("json", await handleUpdateNodePreset(client, code, patch));
   });
-  node.command("copy <code>").description("Copy a node preset to a new code/scope (copy version resets 1.0.0)").option("--url <url>", "server base URL").requiredOption("--new-code <code>", "new unique code (kebab-case)").requiredOption("--new-scope <scope>", "global|project").option("--target-project-id <hex>", "target projectId (required when newScope=project)").action(async (code, opts) => {
+  node.command("copy <code>").description("Copy a node preset to a new code/scope (copy version resets 1.0.0)").option("--url <url>", "server base URL").requiredOption("--new-code <code>", "new unique code (kebab-case)").requiredOption("--new-scope <scope>", "global|project").option("--target-project-id <key|id>", "target projectId (newScope=project; falls back to workspace/instance default project)").action(async (code, opts) => {
     const scopeR = parseEnum(opts.newScope, SkillScopeSchema2, "new-scope");
     if (!scopeR.success) {
       renderResult("json", scopeR);
       return;
     }
     const client = createClient(opts.url);
+    let targetProjectId;
+    const explicitTarget = opts.targetProjectId !== void 0 && opts.targetProjectId.trim().length > 0 ? opts.targetProjectId : void 0;
+    if (explicitTarget !== void 0 || scopeR.data === "project") {
+      const pr = await resolveScopedProject(client, explicitTarget, "instance-default", { commandLabel: "siming node copy" });
+      if (!pr.success) {
+        renderResult("json", pr);
+        return;
+      }
+      targetProjectId = pr.data.projectId;
+    }
     renderResult("json", await handleCopyNodePreset(client, code, {
       newCode: opts.newCode,
       newScope: scopeR.data,
-      ...opts.targetProjectId !== void 0 ? { targetProjectId: opts.targetProjectId } : {}
+      ...targetProjectId !== void 0 ? { targetProjectId } : {}
     }));
   });
   node.command("enabled <code>").description("Enable/disable a node preset (sole write entry for enabled; disabled presets invisible to list/compose)").option("--url <url>", "server base URL").requiredOption("--value <bool>", "true|false").action(async (code, opts) => {
@@ -4792,26 +4991,22 @@ function createFlowCommand() {
   });
   flow.command("install <pkg-spec>").description(
     "Install a node library package from npm \u2014 validate 1.1 manifest \u2192 plan complete assets \u2192 confirm \u2192 apply dependencies \u2192 nodes \u2192 library"
-  ).option("--url <url>", "server base URL").option("--scope <scope>", "install scope: global|project", "global").option("--project <key|id>", "target project (required when scope=project)").option("--registry <url>", "npm registry for pack (e.g. private mirror; default npm config)").option("--yes", "skip interactive confirmation").option("--force", "allow version downgrade; admin may also sync a conflicting model alias display name (realModel is never overwritten)").action(async (pkgSpec, opts) => {
+  ).option("--url <url>", "server base URL").option("--scope <scope>", "install scope: global|project", "global").option("--project <key|id>", "target project (scope=project; falls back to workspace/instance default project)").option("--registry <url>", "npm registry for pack (e.g. private mirror; default npm config)").option("--yes", "skip interactive confirmation").option("--force", "allow version downgrade; admin may also sync a conflicting model alias display name (realModel is never overwritten)").action(async (pkgSpec, opts) => {
     const scopeResult = parseEnum(opts.scope, SkillScopeSchema3, "scope");
     if (!scopeResult.success) {
       renderResult("json", scopeResult);
       return;
     }
     const scope = scopeResult.data;
-    if (scope === "project" && opts.project === void 0) {
-      renderResult("json", fail({ message: "scope=project \u9700\u8981 --project <key|id>", httpStatus: 0 }));
-      return;
-    }
     const client = createClient(opts.url);
     let projectId;
     if (scope === "project") {
-      const projectResult = await resolveProjectId(client, opts.project);
-      if (!projectResult.success) {
-        renderResult("json", projectResult);
+      const pr = await resolveScopedProject(client, opts.project, "instance-default", { commandLabel: "siming flow install" });
+      if (!pr.success) {
+        renderResult("json", pr);
         return;
       }
-      projectId = projectResult.data;
+      projectId = pr.data.projectId;
     }
     const fetched = await fetchManifest(pkgSpec, opts.registry);
     if (!fetched.success) {
@@ -4855,15 +5050,16 @@ ${conflicts.map((item) => `  ${item.kind}:${item.key} \u2014 ${item.reason ?? "\
       cleanup();
     }
   });
-  flow.command("compose <composition>").description("Assemble a DAG template from an installed library composition (value-copy nodes + sourcePreset baseline)").option("--url <url>", "server base URL").requiredOption("--project <key|id>", "target project (template owner)").option("--name <name>", "generated template name (default: composition name)").option("--from <library>", "source library name (required when multiple libraries define the same composition)").action(async (composition, opts) => {
+  flow.command("compose <composition>").description("Assemble a DAG template from an installed library composition (value-copy nodes + sourcePreset baseline)").option("--url <url>", "server base URL").option("--project <key|id>", "target project (template owner; falls back to workspace/instance default project)").option("--name <name>", "generated template name (default: composition name)").option("--from <library>", "source library name (required when multiple libraries define the same composition)").action(async (composition, opts) => {
     const client = createClient(opts.url);
-    const projectResult = await resolveProjectId(client, opts.project);
-    if (!projectResult.success) {
-      renderResult("json", projectResult);
+    const pr = await resolveScopedProject(client, opts.project, "instance-default", { commandLabel: "siming flow compose" });
+    if (!pr.success) {
+      renderResult("json", pr);
       return;
     }
     const result = await composeFlowTemplate(client, composition, {
-      projectId: projectResult.data,
+      projectId: pr.data.projectId,
+      // instance-default 成功必含 id
       ...opts.name !== void 0 ? { name: opts.name } : {},
       ...opts.from !== void 0 ? { from: opts.from } : {}
     });
@@ -6933,13 +7129,13 @@ function parseVersion(v) {
 // src/commands/install/command.ts
 function createInstallCommand() {
   const install = new Command12("install").description("Install skills/agents from Siming to local AI platform");
-  withCommonOpts(install.command("plan"), "table").option("--scope <s>", "install scope: global|project", "global").option("--project <key-or-id>", "project key or id (required when scope=project)").option("--only <name>", 'filter by asset name (repeatable; use "siming" for the MCP entry)', collectArgs, []).description("Preview install plan (no write)").action(async (opts) => {
+  withCommonOpts(install.command("plan"), "table").option("--scope <s>", "install scope: global|project", "global").option("--project <key|id>", "project key or id (scope=project; falls back to workspace/instance default project)").option("--only <name>", 'filter by asset name (repeatable; use "siming" for the MCP entry)', collectArgs, []).description("Preview install plan (no write)").action(async (opts) => {
     const scope = parseScope(opts.scope, opts.format);
     if (!scope) return;
     const client = createClient(opts.url);
     const projectR = await resolveInstallProject(client, scope, opts.project);
     if (!projectR.ok) {
-      renderResult(opts.format, { success: false, error: { message: projectR.error.message, httpStatus: 0, ...projectR.error.hint ? { hint: projectR.error.hint } : {} } });
+      renderResult(opts.format, { success: false, error: { message: projectR.error.message, httpStatus: projectR.error.httpStatus, ...projectR.error.bizCode !== void 0 ? { bizCode: projectR.error.bizCode } : {}, ...projectR.error.hint ? { hint: projectR.error.hint } : {} } });
       return;
     }
     const projectId = projectR.projectId;
@@ -6951,14 +7147,14 @@ function createInstallCommand() {
     const plan = result.data;
     renderInstallPlan2(opts.format, plan, scope, resolveInstallTargets(scope).targets);
   });
-  withCommonOpts(install.command("apply"), "json").option("--scope <s>", "install scope: global|project", "global").option("--project <key-or-id>", "project key or id (required when scope=project)").option("--only <name>", 'install only this asset (repeatable; use "siming" for the MCP entry)', collectArgs, []).option("--yes", "skip interactive confirmation").option("--force", "overwrite all selected local assets, including same-version and conflict items").description("Apply install plan (write to local)").action(
+  withCommonOpts(install.command("apply"), "json").option("--scope <s>", "install scope: global|project", "global").option("--project <key|id>", "project key or id (scope=project; falls back to workspace/instance default project)").option("--only <name>", 'install only this asset (repeatable; use "siming" for the MCP entry)', collectArgs, []).option("--yes", "skip interactive confirmation").option("--force", "overwrite all selected local assets, including same-version and conflict items").description("Apply install plan (write to local)").action(
     async (opts) => {
       const scope = parseScope(opts.scope, opts.format);
       if (!scope) return;
       const client = createClient(opts.url);
       const projectR = await resolveInstallProject(client, scope, opts.project);
       if (!projectR.ok) {
-        renderResult(opts.format, { success: false, error: { message: projectR.error.message, httpStatus: 0, ...projectR.error.hint ? { hint: projectR.error.hint } : {} } });
+        renderResult(opts.format, { success: false, error: { message: projectR.error.message, httpStatus: projectR.error.httpStatus, ...projectR.error.bizCode !== void 0 ? { bizCode: projectR.error.bizCode } : {}, ...projectR.error.hint ? { hint: projectR.error.hint } : {} } });
         return;
       }
       const projectId = projectR.projectId;
@@ -7034,34 +7230,19 @@ function parseScope(s, format) {
 }
 async function resolveInstallProject(client, scope, projectOpt) {
   if (scope === "global") return { ok: true };
-  if (projectOpt) {
-    const r = await resolveProjectId(client, projectOpt);
-    if (!r.success) {
-      return { ok: false, error: { message: r.error.message, ...r.error.hint ? { hint: r.error.hint } : {} } };
-    }
-    return { ok: true, projectId: r.data };
-  }
-  const ws = findWorkspaceDir();
-  const cfg = ws ? readWorkspaceConfigSafe(ws) : null;
-  if (cfg?.defaultProject) {
-    const r = await resolveProjectId(client, cfg.defaultProject);
-    if (r.success) return { ok: true, projectId: r.data };
-    return { ok: false, error: { message: r.error.message, ...r.error.hint ? { hint: r.error.hint } : {} } };
-  }
-  return {
-    ok: false,
-    error: {
-      message: "scope=project requires --project <key|id> or workspace default project",
-      hint: "run `siming config set defaultProject <key|id>` or `siming install --scope project --project <key|id>`"
-    }
-  };
-}
-function readWorkspaceConfigSafe(ws) {
-  try {
-    return readWorkspaceConfig(ws);
-  } catch {
-    return null;
+  const r = await resolveScopedProject(client, projectOpt, "instance-default", { commandLabel: "siming install" });
+  if (!r.success) {
+    return {
+      ok: false,
+      error: {
+        message: r.error.message,
+        httpStatus: r.error.httpStatus,
+        ...r.error.bizCode !== void 0 ? { bizCode: r.error.bizCode } : {},
+        ...r.error.hint ? { hint: r.error.hint } : {}
+      }
+    };
   }
+  return r.data.projectId !== void 0 ? { ok: true, projectId: r.data.projectId } : { ok: true };
 }
 async function buildInstallPlan(client, scope, projectId, only) {
   const listQuery = scope === "global" ? { scope: "global", includeDisabled: true } : { scope: "project", ...projectId ? { projectId } : {}, includeDisabled: true };
@@ -7431,7 +7612,7 @@ async function runInit(client, input) {
   };
 }
 function createInitCommand() {
-  const init = new Command13("init").description("Initialize workspace config for Siming (idempotent)").option("--url <url>", "server base URL (also used to resolve project key)").option("--server-url <url>", "server base URL to persist into workspace config").option("--project <key-or-id>", "project key or id to set as workspace default project").option("--install", "run install apply after init (non-interactive; writes to .agents universal dir)").option("--install-scope <scope>", "install scope when --install: global|project (default: global; global also registers mcp.json)").option("--format <fmt>", "output format", "fancy").action(async (opts) => {
+  const init = new Command13("init").description("Initialize workspace config for Siming (idempotent)").option("--url <url>", "server base URL (also used to resolve project key)").option("--server-url <url>", "server base URL to persist into workspace config").option("--project <key|id>", "project key or id to set as workspace default project").option("--install", "run install apply after init (non-interactive; writes to .agents universal dir)").option("--install-scope <scope>", "install scope when --install: global|project (default: global; global also registers mcp.json)").option("--format <fmt>", "output format", "fancy").action(async (opts) => {
     const client = createClient(opts.url);
     const result = await runInit(client, {
       ...opts.serverUrl ? { serverUrl: opts.serverUrl } : {},
@@ -7744,7 +7925,7 @@ ${ROADMAP_TEXT}
    \u9879\u76EE\u6807\u8BC6\u3001\u5FEB\u901F\u901A\u9053\u89C4\u5219\uFF09\uFF0C\u6309\u6E05\u5355\u66FF\u6362\u4E3A\u9879\u76EE\u771F\u5B9E\u7EA6\u5B9A\u540E\u65B9\u53EF\u7528\u4E8E\u521B\u5EFA\u4EFB\u52A1\u3002
    \u540C\u540D\u51B2\u7A81\u4FDD\u62A4\uFF1A\u9879\u76EE\u5185\u5DF2\u6709\u540C\u540D\u8D44\u4EA7\u65F6\u9ED8\u8BA4\u62D2\u7EDD\u4E14\u96F6\u5199\u5165\uFF1B
    \u786E\u8BA4\u66FF\u6362\u52A0 --overwrite\uFF08\u7248\u672C\u5355\u8C03\u9012\u589E\uFF0C\u542F\u505C\u72B6\u6001\u4E0D\u53D8\uFF09\u3002
-   \u67E5\u770B\u73B0\u5B58\u8D44\u4EA7\uFF1Asiming skill show task-create --scope project --project-id <id>
+   \u67E5\u770B\u73B0\u5B58\u8D44\u4EA7\uFF1Asiming skill show task-create --scope project --project-id <key|id>
 
 2. siming-arch \u2014\u2014 \u67B6\u6784\u6587\u6863\u7D22\u5F15\uFF1A\u6307\u5411\u672C\u9879\u76EE\u4ED3\u5E93\u67B6\u6784\u6587\u6863\u76EE\u5F55\u7684\u9AA8\u67B6
    \uFF08\u6BCF\u9879\u76EE\u4E00\u4EFD\uFF1B\u67B6\u6784\u6587\u6863\u5B9E\u4F53\u5B58\u9879\u76EE\u4ED3\u5E93\uFF0C\u7D22\u5F15\u53EA\u5B58\u4F4D\u7F6E\u4E0D\u5B58\u5185\u5BB9\uFF09\u3002
@@ -8523,7 +8704,7 @@ function parseDeclarationsMap(spec) {
 }
 function createIssueCommand() {
   const issue = new Command18("issue").description("Issue pool: record \u2192 organize \u2192 convert to tasks");
-  withCommonOpts(issue.command("add"), "fancy").description("Record an issue into the pool (source=cli)").argument("[title]", "issue title (or use --title)").option("--title <t>", "issue title (1-200 chars)").option("--description <d>", "issue description (optional)").option("--project <key-or-id>", "projectId (key or id; defaults to workspace defaultProject, then server default project)").action(async (titleArg, opts) => {
+  withCommonOpts(issue.command("add"), "fancy").description("Record an issue into the pool (source=cli)").argument("[title]", "issue title (or use --title)").option("--title <t>", "issue title (1-200 chars)").option("--description <d>", "issue description (optional)").option("--project <key|id>", "projectId (key|id; falls back to workspace defaultProject, then server default project)").action(async (titleArg, opts) => {
     const client = createClient(opts.url);
     const title = opts.title ?? titleArg;
     if (title === void 0 || title.length === 0) {
@@ -8533,21 +8714,12 @@ function createIssueCommand() {
       });
       return;
     }
-    let projectId;
-    if (opts.project) {
-      const r = await resolveProjectId(client, opts.project);
-      if (!r.success) {
-        renderResult("json", r);
-        return;
-      }
-      projectId = r.data;
-    } else {
-      const wsDefaultProject = readWorkspaceConfig()?.defaultProject;
-      if (wsDefaultProject) {
-        const r = await resolveProjectId(client, wsDefaultProject);
-        if (r.success) projectId = r.data;
-      }
+    const projectR = await resolveScopedProject(client, opts.project, "ws-default", { commandLabel: "siming issue add" });
+    if (!projectR.success) {
+      renderResult(opts.format ?? "fancy", projectR);
+      return;
     }
+    const projectId = projectR.data.projectId;
     const result = await handleCreateIssue(client, {
       title,
       ...opts.description !== void 0 ? { description: opts.description } : {},
@@ -8555,7 +8727,7 @@ function createIssueCommand() {
     });
     renderResult(opts.format ?? "fancy", result);
   });
-  withCommonOpts(issue.command("list"), "table").option("--status <s>", "filter by issue status (pending|partial|converted|cancelled)").option("--source <s>", "filter by source channel (mcp|cli|web)").option("--project <key-or-id>", "filter by projectId (key or id)").option("--task <taskId>", "filter by linked task").option("--q <keyword>", "search in title/description").option("--view <v>", "view: all|open (default all; open = \u6709\u6548\u672A\u8DDF\u8FDB\u5B8C)").option("--page <n>", "page number (default 1)", "1").option("--limit <n>", `page size (default ${PAGE_DEFAULT2}, max ${PAGE_MAX2})`).option("--all", `show all (limit ${PAGE_MAX2})`).description("List issues (with progress aggregation done/cancelled/total)").action(async (opts) => {
+  withCommonOpts(issue.command("list"), "table").option("--status <s>", "filter by issue status (pending|partial|converted|cancelled)").option("--source <s>", "filter by source channel (mcp|cli|web)").option("--project <key|id>", "filter by projectId (key|id)").option("--task <taskId>", "filter by linked task").option("--q <keyword>", "search in title/description").option("--view <v>", "view: all|open (default all; open = \u6709\u6548\u672A\u8DDF\u8FDB\u5B8C)").option("--page <n>", "page number (default 1)", "1").option("--limit <n>", `page size (default ${PAGE_DEFAULT2}, max ${PAGE_MAX2})`).option("--all", `show all (limit ${PAGE_MAX2})`).description("List issues (with progress aggregation done/cancelled/total)").action(async (opts) => {
     const client = createClient(opts.url);
     const filters = {};
     if (opts.status) filters.status = opts.status;
@@ -8570,13 +8742,14 @@ function createIssueCommand() {
       }
       filters.view = r.data;
     }
-    if (opts.project) {
-      const r = await resolveProjectId(client, opts.project);
-      if (!r.success) {
-        renderResult(opts.format ?? "table", r);
+    if (opts.project !== void 0 && opts.project.trim().length > 0) {
+      const pr = await resolveScopedProject(client, opts.project, "explicit-only");
+      if (!pr.success) {
+        renderResult(opts.format ?? "table", pr);
         return;
       }
-      filters.projectId = r.data;
+      const pid = pr.data.projectId;
+      if (pid !== void 0) filters.projectId = pid;
     }
     if (opts.all) {
       filters.limit = PAGE_MAX2;
@@ -8656,7 +8829,7 @@ function createIssueCommand() {
     const result = await handleCancelIssue(client, issueId, opts.reason);
     renderResult(opts.format ?? "fancy", result);
   });
-  withCommonOpts(issue.command("convert"), "fancy").requiredOption("--issue-ids <ids>", "comma-separated issue ids (or repeatable flag)", collectArgs, []).option("--declaration <mode>", "uniform declaration for all issues: all|partial (default all)").option("--declarations <map>", "per-issue declarations: id1:all,id2:partial (overrides --declaration)").requiredOption("--title <t>", "new task title").requiredOption("--template <code|name|id>", "DAG template code (preferred), name, or 24-hex id").requiredOption("--track <t>", "task track (backend|ui|mixed|research)").option("--type <t>", "task type (feature|bugfix|ui-tweak|research)").option("--skip <ids>", "node ids to prune (comma-separated, repeatable)", collectArgs, []).option("--project <key-or-id>", "projectId (key or id; issues and new task must belong to it)").description("Convert issues to a task (single group: N issues \u2192 1 task; split = multiple calls)").action(async (opts) => {
+  withCommonOpts(issue.command("convert"), "fancy").requiredOption("--issue-ids <ids>", "comma-separated issue ids (or repeatable flag)", collectArgs, []).option("--declaration <mode>", "uniform declaration for all issues: all|partial (default all)").option("--declarations <map>", "per-issue declarations: id1:all,id2:partial (overrides --declaration)").requiredOption("--title <t>", "new task title").requiredOption("--template <code|name|id>", "DAG template code (preferred), name, or 24-hex id").requiredOption("--track <t>", "task track (backend|ui|mixed|research)").option("--type <t>", "task type (feature|bugfix|ui-tweak|research)").option("--skip <ids>", "node ids to prune (comma-separated, repeatable)", collectArgs, []).option("--project <key|id>", "projectId (key|id; issues and new task must belong to it)").description("Convert issues to a task (single group: N issues \u2192 1 task; split = multiple calls)").action(async (opts) => {
     const client = createClient(opts.url);
     const issueIds = [
       ...new Set((opts.issueIds ?? []).flatMap((s) => s.split(",")).map((s) => s.trim()).filter((s) => s.length > 0))
@@ -8687,13 +8860,13 @@ function createIssueCommand() {
       declarations = Object.fromEntries(issueIds.map((id) => [id, "all"]));
     }
     let projectId;
-    if (opts.project) {
-      const r = await resolveProjectId(client, opts.project);
-      if (!r.success) {
-        renderResult(opts.format ?? "fancy", r);
+    if (opts.project !== void 0 && opts.project.trim().length > 0) {
+      const pr = await resolveScopedProject(client, opts.project, "explicit-only");
+      if (!pr.success) {
+        renderResult(opts.format ?? "fancy", pr);
         return;
       }
-      projectId = r.data;
+      projectId = pr.data.projectId;
     } else {
       const first = await handleGetIssue(client, issueIds[0]);
       if (!first.success) {