oasis_test 0.1.86 → 0.1.87

package/dist/index.js

@@ -141611,7 +141611,8 @@ async function fetchAppBotIdentity(slug6, opts = {}, deps = {}) {
     const body = await resp.json().catch(() => ({}));
     const id = body["id"];
     if (id === void 0 || id === null) return null;
-    return { login, email: `${String(id)}+${login}@users.noreply.github.com` };
+    const actualLogin = typeof body["login"] === "string" && body["login"] ? body["login"] : login;
+    return { login: actualLogin, email: `${String(id)}+${actualLogin}@users.noreply.github.com` };
   } catch {
     return null;
   }
@@ -141681,7 +141682,8 @@ var init_github = __esm({
           { key: "app_installation_id", description: "App \u5728\u8BE5\u7EC4\u7EC7/\u8D26\u53F7\u4E0B\u7684\u5B89\u88C5 ID", secret: false, required: false },
           { key: "app_token_expires_at", description: "installation token \u7684\u7EDD\u5BF9\u8FC7\u671F\u65F6\u523B\uFF08epoch ms\uFF09", secret: false, required: false },
           { key: "app_slug", description: "App \u7684 slug\u2014\u2014bot \u8EAB\u4EFD\u663E\u793A\u4E3A <slug>[bot]", secret: false, required: false },
-          { key: "app_bot_email", description: "bot \u8D26\u53F7\u7684 noreply \u90AE\u7BB1\uFF08commit \u7F72\u540D\u9760\u5B83\u94FE\u63A5\u5230 bot\uFF09", secret: false, required: false }
+          { key: "app_bot_email", description: "bot \u8D26\u53F7\u7684 noreply \u90AE\u7BB1\uFF08commit \u7F72\u540D\u9760\u5B83\u94FE\u63A5\u5230 bot\uFF09", secret: false, required: false },
+          { key: "app_bot_name", description: "bot \u8D26\u53F7\u7684 login\uFF08commit \u7F72\u540D\u7528\u5B83\uFF0C\u4E0E PR \u4F5C\u8005\u9010\u5B57\u4E00\u81F4\uFF09", secret: false, required: false }
         ]
       };
       /** wrapper 在 agent PATH 上冒名的命令——必须与真实 CLI 同名，否则遮蔽不生效。 */
@@ -141700,7 +141702,9 @@ var init_github = __esm({
         { key: "app_slug", from: "GITHUB_APP_SLUG", required: false },
         // bot 的 noreply 邮箱：commit 署名靠**邮箱**链接到账号（name 只是自由文本）。
         // 公开信息，非密钥。
-        { key: "app_bot_email", from: "GITHUB_APP_BOT_EMAIL", required: false }
+        { key: "app_bot_email", from: "GITHUB_APP_BOT_EMAIL", required: false },
+        // bot 的 login：commit 署名的 name 用它，才能和 PR 作者显示成同一个身份。
+        { key: "app_bot_name", from: "GITHUB_APP_BOT_NAME", required: false }
       ];
       /**
        * 续期材料——**只在 server 侧读**。私钥留在这边铸 token，节点只拿铸出来的那一小时。
@@ -141825,9 +141829,11 @@ var init_github = __esm({
         const appSlug = credentials["app_slug"];
         if (appSlug) sessionEnv.set("GH_APP_SLUG", appSlug);
         const botEmail = credentials["app_bot_email"] ?? "";
-        sessionEnv.set("GIT_AUTHOR_NAME", name);
+        const botName = credentials["app_bot_name"] ?? "";
+        const signName = botName || name;
+        sessionEnv.set("GIT_AUTHOR_NAME", signName);
         sessionEnv.set("GIT_AUTHOR_EMAIL", botEmail);
-        sessionEnv.set("GIT_COMMITTER_NAME", name);
+        sessionEnv.set("GIT_COMMITTER_NAME", signName);
         sessionEnv.set("GIT_COMMITTER_EMAIL", botEmail);
         sessionEnv.set("EMAIL", botEmail);
         sessionEnv.set("GIT_CONFIG_COUNT", "1");
@@ -149852,7 +149858,10 @@ async function startOasisServer(opts) {
             }
             if (pending.slug) {
               const bot = await fetchAppBotIdentity(pending.slug, { token: minted.token });
-              if (bot) await put("GITHUB_APP_BOT_EMAIL", bot.email, false);
+              if (bot) {
+                await put("GITHUB_APP_BOT_EMAIL", bot.email, false);
+                await put("GITHUB_APP_BOT_NAME", bot.login, false);
+              }
             }
             pending.done = true;
             delete pending.privateKeyPem;
@@ -150887,6 +150896,7 @@ var init_memory_trace_store = __esm({
           startedAt: run.startedAt,
           effectiveModel: run.effectiveModel,
           runtimeKind: run.runtimeKind,
+          runtimeInstanceId: run.runtimeInstanceId ?? null,
           usage: structuredClone(run.usage)
         }));
       }
@@ -163324,6 +163334,8 @@ function buildOrganizationUsageSummary(input) {
   const runtimeRunCounts = /* @__PURE__ */ new Map();
   const runtimeModels = /* @__PURE__ */ new Map();
   const runtimeEmployees = /* @__PURE__ */ new Map();
+  const runtimeInstanceKind = /* @__PURE__ */ new Map();
+  const runtimeHostnames = input.runtimeHostnames ?? /* @__PURE__ */ new Map();
   for (const run of input.runs) {
     const usage = usageOf(run);
     if (!usage) {
@@ -163379,18 +163391,19 @@ function buildOrganizationUsageSummary(input) {
       empWoMap.set(rowId, empWoUsage);
     }
     addUsage(empWoUsage.usage, usage);
-    const kind = run.runtimeKind;
-    let rtUsage = runtimeTotals.get(kind);
+    const rtKey = run.runtimeInstanceId ?? `__unregistered__:${run.runtimeKind}`;
+    let rtUsage = runtimeTotals.get(rtKey);
     if (!rtUsage) {
       rtUsage = emptyUsage();
-      runtimeTotals.set(kind, rtUsage);
+      runtimeTotals.set(rtKey, rtUsage);
+      runtimeInstanceKind.set(rtKey, run.runtimeKind);
     }
     addUsage(rtUsage, usage);
-    runtimeRunCounts.set(kind, (runtimeRunCounts.get(kind) ?? 0) + 1);
-    let modelMap = runtimeModels.get(kind);
+    runtimeRunCounts.set(rtKey, (runtimeRunCounts.get(rtKey) ?? 0) + 1);
+    let modelMap = runtimeModels.get(rtKey);
     if (!modelMap) {
       modelMap = /* @__PURE__ */ new Map();
-      runtimeModels.set(kind, modelMap);
+      runtimeModels.set(rtKey, modelMap);
     }
     let modelUsage = modelMap.get(run.effectiveModel);
     if (!modelUsage) {
@@ -163398,10 +163411,10 @@ function buildOrganizationUsageSummary(input) {
       modelMap.set(run.effectiveModel, modelUsage);
     }
     addUsage(modelUsage, usage);
-    let rtEmpMap = runtimeEmployees.get(kind);
+    let rtEmpMap = runtimeEmployees.get(rtKey);
     if (!rtEmpMap) {
       rtEmpMap = /* @__PURE__ */ new Map();
-      runtimeEmployees.set(kind, rtEmpMap);
+      runtimeEmployees.set(rtKey, rtEmpMap);
     }
     let rtEmpUsage = rtEmpMap.get(run.actorId);
     if (!rtEmpUsage) {
@@ -163453,9 +163466,17 @@ function buildOrganizationUsageSummary(input) {
     (e) => e.share,
     (e, s2) => ({ ...e, share: s2 })
   );
+  function resolveHostname(rtKey, kind) {
+    const h = runtimeHostnames.get(rtKey);
+    if (h) return h;
+    const parts = rtKey.split(":");
+    if (parts.length >= 3 && parts[0] === "runtime") return parts[1];
+    return kind;
+  }
   const runtimeRows = normalizeShares(
-    [...runtimeTotals].map(([runtimeKind, usage]) => {
-      const modelMap = runtimeModels.get(runtimeKind) ?? /* @__PURE__ */ new Map();
+    [...runtimeTotals].map(([rtKey, usage]) => {
+      const kind = runtimeInstanceKind.get(rtKey) ?? "unknown";
+      const modelMap = runtimeModels.get(rtKey) ?? /* @__PURE__ */ new Map();
       const models = normalizeShares(
         [...modelMap].map(([model, modelUsage]) => ({
           model,
@@ -163465,7 +163486,7 @@ function buildOrganizationUsageSummary(input) {
         (m2) => m2.share,
         (m2, s2) => ({ ...m2, share: s2 })
       );
-      const empMap = runtimeEmployees.get(runtimeKind);
+      const empMap = runtimeEmployees.get(rtKey);
       const employees = normalizeShares(
         empMap ? [...empMap].map(([actorId, empUsage]) => ({
           actorId,
@@ -163476,10 +163497,12 @@ function buildOrganizationUsageSummary(input) {
         (e, s2) => ({ ...e, share: s2 })
       );
       return {
-        runtimeKind,
+        runtimeInstanceId: rtKey,
+        hostname: resolveHostname(rtKey, kind),
+        runtimeKind: kind,
         usage,
         share: total.tokens > 0 ? usage.tokens / total.tokens : 0,
-        runCount: runtimeRunCounts.get(runtimeKind) ?? 0,
+        runCount: runtimeRunCounts.get(rtKey) ?? 0,
         models,
         employees
       };
@@ -163744,10 +163767,17 @@ function collabDomain(opts) {
         return { status: 400, body: { error: { code: "bad_request", message: "timeZone \u65E0\u6548" } } };
       }
       const { kernel } = await resolveCtx(req.auth.companyId);
-      const runs = await opts.trace.listUsageRuns({ from, to });
+      const [runs, runtimeRecords] = await Promise.all([
+        opts.trace.listUsageRuns({ from, to }),
+        opts.listRuntimes ? opts.listRuntimes().catch(() => []) : Promise.resolve([])
+      ]);
+      const runtimeHostnames = /* @__PURE__ */ new Map();
+      for (const rt of runtimeRecords) {
+        if (rt.id && rt.hostname) runtimeHostnames.set(rt.id, rt.hostname);
+      }
       return {
         status: 200,
-        body: buildOrganizationUsageSummary({ model: kernel.model, runs, bucketKind: bucket, timeZone })
+        body: buildOrganizationUsageSummary({ model: kernel.model, runs, bucketKind: bucket, timeZone, runtimeHostnames })
       };
     });
     router.get("/api/workorders", async (req) => {
@@ -177239,7 +177269,7 @@ var init_postgres_trace = __esm({
       }
       async listUsageRuns(filter) {
         const r = await this.pool.query(
-          `SELECT actor_id, artifact_id, started_at, effective_model, runtime_kind, usage
+          `SELECT actor_id, artifact_id, started_at, effective_model, runtime_kind, runtime_instance_id, usage
        FROM ${this.s}.agent_runs
        WHERE jsonb_typeof(usage) = 'object' AND started_at >= $1 AND started_at <= $2
        ORDER BY started_at`,
@@ -177251,6 +177281,7 @@ var init_postgres_trace = __esm({
           startedAt: row.started_at,
           effectiveModel: row.effective_model ?? null,
           runtimeKind: row.runtime_kind ?? "shell",
+          runtimeInstanceId: row.runtime_instance_id ?? null,
           usage: row.usage
         }));
       }
@@ -180404,6 +180435,8 @@ async function startServe(opts) {
         trace: trace.service,
         registry: registryStore,
         artifacts: artifactStateStore,
+        // 组织汇总用——从 node_runtimes 取 hostname，解析运行时实例标签（kind @ hostname）
+        listRuntimes: (nodeId) => nodeStore.listRuntimes(nodeId),
         dispatchJournal: () => journalRing.slice(-200),
         // 诊断 92ac8f18-83e5fde6 §④ D-2：按**请求公司**取其 dispatcher 的 queued/backoff 信号。
         // CO-302 每家公司各有一套 dispatcher（dispatchers 以 companyId 为键）——固定读默认公司会让
@@ -182957,7 +182990,7 @@ var COMMAND_DECLS = {
   // —— 版本机（§5） ——
   spawn: {
     usage: "oasis spawn <artifactId> --type <t> [--title <\u77ED\u540D>] [--brief <\u89C4\u683C>] [--input <\u4E0A\u6E38id>[,<id>\u2026]] [--owner <actorId>] [--workspace ws] [--persistence temp|persistent] [--parts-file <json>] [--<\u5B57\u6BB5> <\u503C>] [--set-json <json>]",
-    description: "\u521B\u5EFA\u65B0\u4EA7\u7269\u8282\u70B9\uFF08\xA75 \u7248\u672C\u673A\uFF09\u3002--<\u5B57\u6BB5> <\u503C> \u662F\u8BE5\u7C7B\u578B\u52A8\u6001\u58F0\u660E\u7684\u81EA\u5B9A\u4E49\u5B57\u6BB5\uFF08\u7528 oasis artifact-types show <type> \u67E5\u770B\uFF09\u3002",
+    description: "\u521B\u5EFA\u65B0\u4EA7\u7269\u8282\u70B9\uFF08\xA75 \u7248\u672C\u673A\uFF09\u3002--<\u5B57\u6BB5> <\u503C> \u662F\u8BE5\u7C7B\u578B\u52A8\u6001\u58F0\u660E\u7684\u81EA\u5B9A\u4E49\u5B57\u6BB5\uFF08\u7528 oasis artifact-types show <type|\u8BE5\u4EA7\u7269 id> \u67E5\u770B\uFF09\u3002",
     positional: [
       { name: "<artifactId>", required: true, desc: "\u4EA7\u7269 id" }
     ],
@@ -183510,9 +183543,9 @@ var COMMAND_DECLS = {
   },
   // —— 类型管理 ——
   "artifact-types": {
-    usage: "oasis artifact-types [list | search <q> | show <type> | add ... | edit ... | deprecate ... | delete ... | add-field ... | edit-field ... | drop-field ...]",
-    description: "\u7BA1\u7406 artifact \u7C7B\u578B\u6CE8\u518C\u8868\u3002\u5B50\u547D\u4EE4\uFF1Alist\uFF08\u5217\u51FA\u5168\u90E8\uFF09\u3001search\uFF08\u641C\u7D22\uFF09\u3001show\uFF08\u770B\u8BE6\u60C5\u542B\u81EA\u5B9A\u4E49\u5B57\u6BB5\u8868\uFF09\u3001add/edit/deprecate/delete\uFF08\u7C7B\u578B CRUD\uFF09\u3001add-field/edit-field/drop-field\uFF08\u5B57\u6BB5\u7BA1\u7406\uFF09\u3002",
-    examples: ["oasis artifact-types list", "oasis artifact-types show dev"]
+    usage: "oasis artifact-types [list | search <q> | show <type|artifactId> | add ... | edit ... | deprecate ... | delete ... | add-field ... | edit-field ... | drop-field ...]",
+    description: "\u7BA1\u7406 artifact \u7C7B\u578B\u6CE8\u518C\u8868\u3002\u5B50\u547D\u4EE4\uFF1Alist\uFF08\u5217\u51FA\u5168\u90E8\uFF09\u3001search\uFF08\u641C\u7D22\uFF09\u3001show\uFF08\u770B\u8BE6\u60C5\u542B\u81EA\u5B9A\u4E49\u5B57\u6BB5\u8868\uFF1B**\u76F4\u63A5\u5582\u4EA7\u7269 id \u4E5F\u884C**\uFF0C\u81EA\u52A8\u89E3\u6790\u6210\u5B83\u7684\u7C7B\u578B\uFF09\u3001add/edit/deprecate/delete\uFF08\u7C7B\u578B CRUD\uFF09\u3001add-field/edit-field/drop-field\uFF08\u5B57\u6BB5\u7BA1\u7406\uFF09\u3002",
+    examples: ["oasis artifact-types list", "oasis artifact-types show dev", "oasis artifact-types show artifact:brief:abc-123"]
   },
   // —— 工单 ——
   "create-workorder": {
@@ -183724,7 +183757,7 @@ var COMMAND_DECLS = {
   },
   edit: {
     usage: "oasis edit <id> [--title \u2026] [--brief \u2026] [--<\u5B57\u6BB5> <\u503C>] [--set-json <json>] [--clear <\u5B57\u6BB5,\u2026>]",
-    description: "\u4FEE\u6539\u4EA7\u7269\u5C5E\u6027\uFF08\xA75 \u6682\u5B58\u6001\u2014\u2014OASIS_STAGE=1 \u4E0B\u751F\u6548\uFF09\u3002--<\u5B57\u6BB5> <\u503C> \u662F\u8BE5\u7C7B\u578B\u52A8\u6001\u58F0\u660E\u7684\u81EA\u5B9A\u4E49\u5B57\u6BB5\uFF08\u7528 oasis show <id> / artifact-types show <type> \u67E5\u770B\uFF09\u3002set-json / clear \u7684\u6392\u9664\u4E0E\u4E13\u9879\u5904\u7406\u89C1 fieldsFromFlags\u3002",
+    description: "\u4FEE\u6539\u4EA7\u7269\u5C5E\u6027\uFF08\xA75 \u6682\u5B58\u6001\u2014\u2014OASIS_STAGE=1 \u4E0B\u751F\u6548\uFF09\u3002--<\u5B57\u6BB5> <\u503C> \u662F\u8BE5\u7C7B\u578B\u52A8\u6001\u58F0\u660E\u7684\u81EA\u5B9A\u4E49\u5B57\u6BB5\uFF08\u7528 oasis artifact-types show <\u8BE5\u4EA7\u7269 id> \u67E5\u770B\uFF09\u3002set-json / clear \u7684\u6392\u9664\u4E0E\u4E13\u9879\u5904\u7406\u89C1 fieldsFromFlags\u3002",
     positional: [
       { name: "<id>", required: true, desc: "\u4EA7\u7269 id" }
     ],
@@ -183858,7 +183891,7 @@ var USAGE = `oasis \u2014\u2014 artifact-centric \u534F\u4F5C\u5185\u6838 CLI\uF
   \u7248\u672C\u673A\uFF08\xA75\uFF09
   spawn     <artifactId> --type <t> [--title <\u77ED\u540D>] [--brief <\u89C4\u683C>] [--input <\u4E0A\u6E38id>[,<id>\u2026]] [--owner <actorId>] [--workspace ws] [--persistence temp|persistent] [--parts-file <json>] [--<\u5B57\u6BB5> <\u503C>] [--set-json <json>]
             # --parts-file\uFF1Aconvergent \u5E76\u884C\u5206\u89E3\u7684\u90E8\u4EF6\u6E05\u5355 JSON [{name, spec?, deps?}]\uFF08Stage 3\uFF0C\u7CFB\u7EDF\u6309\u90E8\u4EF6\u6D3E N \u8DEF\uFF09
-            # --<\u5B57\u6BB5> <\u503C>\uFF1A\u8BE5\u7C7B\u578B\u3010\u52A8\u6001\u58F0\u660E\u3011\u7684\u81EA\u5B9A\u4E49\u5B57\u6BB5\uFF08\u4E0D\u662F\u56FA\u5B9A\u6E05\u5355\uFF09\u2014\u2014\u7528 "oasis artifact-types show <type>" \u770B\u53EF\u586B\u5B57\u6BB5\uFF1Bstring[]/\u6279\u91CF\u7528 --set-json\uFF1B\u7F3A\u5FC5\u586B\u4F1A\u62A5\u9519\u5217\u51FA
+            # --<\u5B57\u6BB5> <\u503C>\uFF1A\u8BE5\u7C7B\u578B\u3010\u52A8\u6001\u58F0\u660E\u3011\u7684\u81EA\u5B9A\u4E49\u5B57\u6BB5\uFF08\u4E0D\u662F\u56FA\u5B9A\u6E05\u5355\uFF09\u2014\u2014\u7528 "oasis artifact-types show <type|\u8BE5\u4EA7\u7269 id>" \u770B\u53EF\u586B\u5B57\u6BB5\uFF1Bstring[]/\u6279\u91CF\u7528 --set-json\uFF1B\u7F3A\u5FC5\u586B\u4F1A\u62A5\u9519\u5217\u51FA
   propose   <artifactId> [--file <path> | --from-dir <path> | --git-commit <sha>] --reason <text> [--base <revisionId|none>] [--part <name>] [--rebase-of <revisionId>] [--checkpoint --continue]
             # --file \u5355\u6587\u4EF6\uFF1B--from-dir \u9012\u5F52\u6574\u76EE\u5F55\u4E3A\u591A\u6587\u4EF6 revision\uFF08\u88C5\u7BB1\u5355\uFF0C\u8DE8\u7248\u672C\u53BB\u91CD\uFF0CF1\uFF09\u3002
             # \u4EE3\u7801\u8282\u70B9\u53EF\u3010\u7701\u7565\u5168\u90E8\u5185\u5BB9\u53C2\u6570\u3011\uFF0C\u4EC5 --reason\uFF1A\u5148\u628A\u6539\u52A8 push \u5230\u5DE5\u5355 feat \u5206\u652F\uFF0C\u7CFB\u7EDF\u81EA\u52A8\u4ECE git \u6536\u96C6\uFF08\u672C\u4F53\u5728 git\uFF09\u3002
@@ -183914,7 +183947,7 @@ var USAGE = `oasis \u2014\u2014 artifact-centric \u534F\u4F5C\u5185\u6838 CLI\uF
   log <artifactId>                                 # \u8BE5\u4EA7\u7269\u7684**\u64CD\u4F5C\u65E5\u5FD7**\uFF1A\u5DF2\u53D1\u751F\u7684\u5185\u6838\u4E8B\u5B9E\uFF08spawn/propose/merge/conclude\u2026\uFF09\uFF0C\u4ECE oplog \u8BFB
   session-log <runId|artifactId> [--n 20]          # \u67D0 agent **\u4F1A\u8BDD\u7684\u8FD0\u884C\u65F6\u8F93\u51FA**\uFF08\u65C1\u8D26\uFF0C\u975E\u5185\u6838\u4E8B\u5B9E\uFF09\uFF1A\u6700\u65B0 N \u6761\u4E8B\u4EF6 + "\u8DDD\u4E0A\u6B21\u4E8B\u4EF6 X \u5206\u949F"\uFF08>10min\u2248\u5361\uFF09+ \u5728\u98DE tool_use\u2014\u2014\u5224"\u60F3 vs \u5361"\u3002\u6CE8\u610F\u2260 log\uFF1Alog \u770B\u4EA7\u7269\u7ECF\u5386\u4E86\u4EC0\u4E48\uFF0Csession-log \u770B agent \u6B64\u523B\u5728\u8BF4/\u5E72\u4EC0\u4E48
   artifact-types [list | search <q>]               # \u770B/\u68C0\u7D22\u5DF2\u6CE8\u518C\u7C7B\u578B\uFF08\u7528\u9014/owner/\u72B6\u6001\uFF09\u2014\u2014\u7ED9\u4EBA\u548C agent \u9009 type
-  artifact-types show <type>                        # \u770B\u5355\u7C7B\u578B\u8BE6\u60C5\uFF1A\u542B\u3010\u81EA\u5B9A\u4E49\u5B57\u6BB5\u8868\u3011(\u540D/\u7C7B\u578B/\u5FC5\u586B/\u8BF4\u660E)\u2014\u2014spawn/edit \u524D\u67E5\u80FD\u586B\u5565
+  artifact-types show <type|artifactId>             # \u770B\u5355\u7C7B\u578B\u8BE6\u60C5\uFF1A\u542B\u3010\u81EA\u5B9A\u4E49\u5B57\u6BB5\u8868\u3011(\u540D/\u7C7B\u578B/\u5FC5\u586B/\u8BF4\u660E)\u2014\u2014spawn/edit \u524D\u67E5\u80FD\u586B\u5565\u3002**\u76F4\u63A5\u5582\u4EA7\u7269 id \u4E5F\u884C**\uFF0C\u81EA\u52A8\u89E3\u6790\u6210\u5B83\u7684\u7C7B\u578B
   artifact-types add <name> (--content-type <t> --owner-role <r> | --file <json>) [--description \u2026]   # \u65B0\u589E\uFF08--file \u6536\u5B8C\u6574 ArtifactTypeDef\uFF1Atriggers/reviews/grounding/budget/acl/mirror\u2026\uFF09
   artifact-types edit <name> [--file <json>] [--description \u2026] [--owner-role \u2026] [--content-type \u2026]    # \u6539\u7C7B\u578B\u914D\u7F6E\uFF08name \u4E0D\u53EF\u6539\uFF1BcontentType \u6709\u5B58\u91CF\u5373\u62E6\uFF1B--file \u6536\u5B8C\u6574 patch\u3002\u6539\u5B57\u6BB5\u7528 *-field\uFF09
   artifact-types add-field <type> <\u5B57\u6BB5> --type <string|string[]|number|boolean> [--required true] [--description \u2026]   # \u7ED9\u7C7B\u578B\u3010\u58F0\u660E\u3011\u4E00\u4E2A\u81EA\u5B9A\u4E49\u5B57\u6BB5\uFF08\u6539 schema\u3001\u5F71\u54CD\u8BE5 type \u6240\u6709\u8282\u70B9\u7684\u672A\u6765\u5199\u5165\uFF09
@@ -184571,7 +184604,7 @@ async function runCli(argv, println = console.log) {
         const fields = fieldsFromFlags(ownFlagsFromDecl("edit"));
         return {
           action: "edit",
-          artifactId: needPos(positional, 0, "oasis edit <id> [--title \u2026] [--brief \u2026] [--<\u5B57\u6BB5> <\u503C>] [--set-json <json>] [--clear <\u5B57\u6BB5,\u2026>]\uFF08--<\u5B57\u6BB5> \u662F\u8BE5\u7C7B\u578B\u52A8\u6001\u58F0\u660E\u7684\uFF0C\u7528 oasis show <id> / artifact-types show <type> \u770B\u53EF\u586B\u5B57\u6BB5\uFF09"),
+          artifactId: needPos(positional, 0, "oasis edit <id> [--title \u2026] [--brief \u2026] [--<\u5B57\u6BB5> <\u503C>] [--set-json <json>] [--clear <\u5B57\u6BB5,\u2026>]\uFF08--<\u5B57\u6BB5> \u662F\u8BE5\u7C7B\u578B\u52A8\u6001\u58F0\u660E\u7684\uFF0C\u7528 oasis artifact-types show <\u8BE5\u4EA7\u7269 id> \u770B\u53EF\u586B\u5B57\u6BB5\uFF09"),
           ...flags.get("title") !== void 0 ? { title: flags.get("title") } : {},
           ...flags.get("brief") !== void 0 ? { description: flags.get("brief") } : {},
           ...fields !== void 0 ? { fields } : {}
@@ -185989,13 +186022,21 @@ ${res.warning}`);
         break;
       }
       if (sub === "show") {
-        const name = needPos(positional, 1, "oasis artifact-types show <type>");
+        const ref2 = needPos(positional, 1, "oasis artifact-types show <type|artifactId>");
+        let name = ref2;
+        let resolvedFrom;
+        if (ref2.startsWith("artifact:")) {
+          const v2 = await api.view("show", ref2);
+          name = v2.artifact.type;
+          resolvedFrom = ref2;
+        }
         const { items } = await api.request("GET", "/api/artifact-types");
         const t = items.find((x2) => x2.name === name);
         if (!t) {
           println(`\uFF08\u65E0\u6B64\u7C7B\u578B: ${name}\uFF09`);
           break;
         }
+        if (resolvedFrom) println(`${resolvedFrom} \u7684\u7C7B\u578B\u662F ${name}\uFF1A`);
         println(`${t.name}${t.status === "deprecated" ? " [\u5DF2\u5F03\u7528]" : ""}  (${t.contentType}, owner=${t.ownerRole})${t.description ? ` \u2014\u2014 ${t.description}` : ""}`);
         const fds = t.fieldDefs ?? [];
         println(fds.length === 0 ? "  \u81EA\u5B9A\u4E49\u5B57\u6BB5\uFF1A\u65E0" : "  \u81EA\u5B9A\u4E49\u5B57\u6BB5\uFF1A");
@@ -186133,7 +186174,7 @@ function syncRuntimeAssets(candidateRoots, binDir) {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "0.1.86" : "dev";
+var PKG_VERSION = true ? "0.1.87" : "dev";
 var OASIS_DIR = path29.join(os9.homedir(), ".oasis");
 var CONFIG_FILE = path29.join(OASIS_DIR, "node-config.json");
 var PID_FILE = path29.join(OASIS_DIR, "node.pid");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oasis_test",
-  "version": "0.1.86",
+  "version": "0.1.87",
   "description": "Oasis node daemon + CLI — background daemon, auto-start, full server CLI",
   "bin": {
     "oasis": "./dist/index.js"
@@ -26,6 +26,6 @@
     "node": ">=20"
   },
   "oasisRelease": {
-    "sourceHead": "79b39bef7a68e1bb8d7135fb8e46efeb9a94b8c7"
+    "sourceHead": "f529e39d68297fc8219978cde48c3441e56764a7"
   }
 }