oasis_test 0.1.6 → 0.1.8

package/dist/index.js

@@ -16056,6 +16056,26 @@ function parsePlanningIssues(body) {
     return [];
   }
 }
+function workorderSpecBody(spec) {
+  return WORKORDER_SPEC_PREFIX + JSON.stringify(spec);
+}
+function parseWorkorderSpec(body) {
+  const first = body.split("\n", 1)[0] ?? "";
+  if (!first.startsWith(WORKORDER_SPEC_PREFIX)) return null;
+  try {
+    const parsed = JSON.parse(first.slice(WORKORDER_SPEC_PREFIX.length));
+    if (!parsed || typeof parsed !== "object") return null;
+    const out = {};
+    if (typeof parsed.goal === "string" && parsed.goal.trim()) out.goal = parsed.goal.trim();
+    if (Array.isArray(parsed.acceptanceCriteria)) {
+      const items = parsed.acceptanceCriteria.filter((x) => typeof x === "string" && x.trim().length > 0).map((x) => x.trim());
+      if (items.length > 0) out.acceptanceCriteria = items;
+    }
+    return out.goal !== void 0 || out.acceptanceCriteria !== void 0 ? out : null;
+  } catch {
+    return null;
+  }
+}
 async function buildDynamicWorkorderPlan(input) {
   const schema = input.schema;
   const schemaByName = new Map(schema.map((def) => [def.name, def]));
@@ -16088,6 +16108,15 @@ async function buildDynamicWorkorderPlan(input) {
       description: input.description
     }
   ];
+  const spec = {};
+  if (input.goal?.trim()) spec.goal = input.goal.trim();
+  if (input.acceptanceCriteria?.length) {
+    const items = input.acceptanceCriteria.map((x) => x.trim()).filter(Boolean);
+    if (items.length > 0) spec.acceptanceCriteria = items;
+  }
+  if (spec.goal !== void 0 || spec.acceptanceCriteria !== void 0) {
+    ops.push({ action: "annotate", artifactId: briefId, body: workorderSpecBody(spec), blocks: false });
+  }
   const spawned = [{ id: briefId, type: "brief", role: "pm", owner: briefOwner }];
   const agentGraph = input.agentPlan ? normalizeAgentPlan(input.agentPlan, primaryType) : null;
   if (input.agentPlan && !agentGraph) {
@@ -16420,7 +16449,7 @@ function artifactSlug(idOrWorkspace, description) {
   const slug4 = source.trim().toLowerCase().replace(/^wo-/, "").replace(/[^a-z0-9\u4e00-\u9fa5]+/g, "-").replace(/^-|-$/g, "").slice(0, 40);
   return slug4 || `wo-${Date.now()}`;
 }
-var PLANNING_ISSUES_PREFIX, DEFAULT_TYPES;
+var PLANNING_ISSUES_PREFIX, DEFAULT_TYPES, WORKORDER_SPEC_PREFIX;
 var init_planner = __esm({
   "../server/src/domains/collab/planner.ts"() {
     "use strict";
@@ -16434,6 +16463,7 @@ var init_planner = __esm({
       { name: "dev", contentType: "code", ownerRole: "dev" },
       { name: "qa", contentType: "text", ownerRole: "qa" }
     ];
+    WORKORDER_SPEC_PREFIX = "OASIS_WORKORDER_SPEC ";
   }
 });
 
@@ -16710,6 +16740,13 @@ async function runCommand(kernel, blobs, oplog, actor, command, args, ctx = {})
       if ((createdViaArg ?? "manual-spawn") === "seed" && ctx.schema) {
         const title = optStr(args, "title") ?? optStr(args, "description") ?? workspace;
         const brief = optStr(args, "brief") ?? optStr(args, "body") ?? optStr(args, "description") ?? workspace;
+        const goal = optStr(args, "goal");
+        const rawCriteria = args["acceptance_criteria"] ?? args["acceptanceCriteria"];
+        const acceptanceCriteria = Array.isArray(rawCriteria) ? rawCriteria.filter((x) => typeof x === "string" && x.trim().length > 0).map((x) => x.trim()) : void 0;
+        const briefForPlanner = acceptanceCriteria && acceptanceCriteria.length > 0 ? `${brief}
+
+\u9A8C\u6536\u6807\u51C6\uFF1A
+${acceptanceCriteria.map((c) => `- ${c}`).join("\n")}` : brief;
         const agentIssues = [];
         let agentPlan = null;
         if (ctx.planWorkorderWithAgent) {
@@ -16724,7 +16761,7 @@ async function runCommand(kernel, blobs, oplog, actor, command, args, ctx = {})
               requestedType: type,
               workspace,
               title,
-              brief,
+              brief: briefForPlanner,
               artifactTypes: ctx.schema.map((def) => ({
                 name: def.name,
                 ownerRole: def.ownerRole,
@@ -16757,6 +16794,8 @@ async function runCommand(kernel, blobs, oplog, actor, command, args, ctx = {})
           workspace,
           title,
           description: brief,
+          ...goal !== void 0 ? { goal } : {},
+          ...acceptanceCriteria && acceptanceCriteria.length > 0 ? { acceptanceCriteria } : {},
           actor,
           schema: ctx.schema,
           ...optStr(args, "id") !== void 0 ? { requestedArtifactId: optStr(args, "id") } : {},
@@ -18041,6 +18080,29 @@ function createNodeTokenStore(file) {
     }
   };
 }
+function createEnrollTokenStore(defaultTtlMs = 30 * 60 * 1e3) {
+  const table = /* @__PURE__ */ new Map();
+  const prune = () => {
+    const now = Date.now();
+    for (const [token, entry] of table) if (entry.expiresAt <= now) table.delete(token);
+  };
+  return {
+    issue(nodeId, ttlMs = defaultTtlMs) {
+      prune();
+      const token = `ent_${(0, import_node_crypto3.randomBytes)(24).toString("base64url")}`;
+      const expiresAt = Date.now() + ttlMs;
+      table.set(token, { nodeId, expiresAt });
+      return { token, expiresAt: new Date(expiresAt).toISOString() };
+    },
+    consume(token) {
+      prune();
+      const entry = table.get(token);
+      if (!entry) return null;
+      table.delete(token);
+      return { nodeId: entry.nodeId };
+    }
+  };
+}
 var import_node_crypto3, fs;
 var init_tokens = __esm({
   "../server/src/tokens.ts"() {
@@ -19074,6 +19136,7 @@ function buildWorkorderSummaries(model, resolveActor, resolveProject) {
   for (const [workspace, arts] of byWorkspace) {
     const members = arts.map((a) => nodeInfo(model, a));
     const seed = arts.find((a) => a.inputs.length === 0) ?? arts[0];
+    const spec = workorderSpecOf(model, arts);
     const concluded = members.filter((m) => m.concluded).length;
     const lastOps = arts.map((a) => model.lastOpAt.get(a.id)).filter((t) => Boolean(t)).sort();
     const participantIds = [...new Set(arts.map((a) => a.owner))];
@@ -19081,8 +19144,10 @@ function buildWorkorderSummaries(model, resolveActor, resolveProject) {
     out.push({
       id: workspace,
       title: woTitle,
-      // 工单目标 = 根产物 description；仅当与标题不同（根产物有独立 title）时给出，避免与 title 重复
+      // 工单完整内容 = 根产物 description；仅当与标题不同（根产物有独立 title）时给出，避免与 title 重复
       ...seed.description && seed.description !== woTitle ? { description: seed.description } : {},
+      // 一句话目标：优先取结构化 spec.goal；缺省时前端回退 description 首段（投影不替前端做回退，只给真值）
+      ...spec?.goal ? { goal: spec.goal } : {},
       stage: deriveStage(members),
       owner: ref(seed.owner),
       participants: participantIds.map(ref),
@@ -19100,6 +19165,16 @@ function planningStatusOf(model, arts) {
   const issues = [...model.annotations.values()].filter((annotation) => ids.has(annotation.anchor.target)).flatMap((annotation) => parsePlanningIssues(annotation.body));
   return issues.length > 0 ? { status: "needs_staffing", issues } : { status: "ready", issues: [] };
 }
+function workorderSpecOf(model, arts) {
+  const seed = arts.find((a) => a.type === "brief") ?? arts.find((a) => a.inputs.length === 0);
+  if (!seed) return null;
+  for (const annotation of model.annotations.values()) {
+    if (annotation.anchor.target !== seed.id) continue;
+    const spec = parseWorkorderSpec(annotation.body);
+    if (spec) return spec;
+  }
+  return null;
+}
 var init_workorders = __esm({
   "../server/src/domains/collab/workorders.ts"() {
     "use strict";
@@ -24556,7 +24631,8 @@ var init_daemon_hub = __esm({
                 cb(false, 401, "invalid node token");
                 return;
               }
-              info.req.oasisNodeId = nodeId;
+              const claimed = info.req.headers["x-daemon-id"];
+              info.req.oasisNodeId = claimed || nodeId;
               cb(true);
             }
           } : {}
@@ -27437,7 +27513,7 @@ Write-Host "  Remove : Unregister-ScheduledTask -TaskName 'OasisNode-${p.nodeId}
 }
 function buildNpxCmd(p) {
   const namePart = p.nodeName ? ` --name ${p.nodeName}` : "";
-  return `npx -y oasis_test@latest start --server-ws ${p.gatewayUrl} --id ${p.nodeId}${namePart} --token ${p.token}`;
+  return `npx -y oasis_test@latest start --server-ws ${p.gatewayUrl} --id ${p.nodeId}${namePart} --enroll-token ${p.token}`;
 }
 var init_connect_script = __esm({
   "../server/src/domains/nodes/connect-script.ts"() {
@@ -27488,9 +27564,39 @@ function nodesDomain(deps) {
     };
   }
   return (router) => {
+    async function syncConnectedDaemon(daemonId, hub) {
+      const d = hub.connectedDaemons().find((c) => c.daemonId === daemonId);
+      if (!d) return;
+      const existing = await deps.nodeStore.getNode(daemonId);
+      await deps.nodeStore.upsertNode({
+        id: daemonId,
+        hostname: d.meta.hostname,
+        nodeVersion: d.meta.nodeVersion ?? "unknown",
+        status: "online",
+        lastSeenAt: (/* @__PURE__ */ new Date()).toISOString(),
+        enrolledAt: existing?.enrolledAt ?? (/* @__PURE__ */ new Date()).toISOString(),
+        ...d.meta.nodeName ? { name: d.meta.nodeName } : existing?.name ? { name: existing.name } : {}
+      });
+      const capabilities = d.meta.runtimes?.length ? d.meta.runtimes : d.meta.adapters.map((kind) => ({ kind, binary: void 0, version: void 0 }));
+      for (const cap of capabilities) {
+        await deps.nodeStore.upsertRuntime({
+          id: `runtime:${daemonId}:${cap.kind}`,
+          nodeId: daemonId,
+          kind: cap.kind,
+          hostname: d.meta.hostname,
+          ...cap.binary ? { binary: cap.binary } : {},
+          ...cap.version ? { version: cap.version } : {},
+          status: "online",
+          lastSeenAt: (/* @__PURE__ */ new Date()).toISOString()
+        });
+      }
+    }
     router.get("/api/nodes", async () => {
       const hub = deps.getHub();
-      if (hub) wireHub(hub);
+      if (hub) {
+        wireHub(hub);
+        await Promise.all(hub.connectedDaemons().map((d) => syncConnectedDaemon(d.daemonId, hub)));
+      }
       const nodes = await deps.nodeStore.listNodes();
       const items = await Promise.all(nodes.map(async (n) => {
         const rts = await deps.nodeStore.listRuntimes(n.id);
@@ -27517,7 +27623,10 @@ function nodesDomain(deps) {
     });
     router.get("/api/runtimes", async () => {
       const hub = deps.getHub();
-      if (hub) wireHub(hub);
+      if (hub) {
+        wireHub(hub);
+        await Promise.all(hub.connectedDaemons().map((d) => syncConnectedDaemon(d.daemonId, hub)));
+      }
       const rts = await deps.nodeStore.listRuntimes();
       const items = rts.map((r) => ({
         id: r.id,
@@ -27534,28 +27643,28 @@ function nodesDomain(deps) {
     });
     router.post("/api/nodes/enroll", async (req) => {
       const body = req.body ?? {};
-      const requested = body.nodeId?.trim();
-      const nodeId = requested || `node-${(0, import_node_crypto9.randomUUID)().slice(0, 8)}`;
       const nodeName = body.nodeName?.trim() || void 0;
-      for (const { token: token2, nodeId: existing2 } of deps.nodeTokens.list()) {
-        if (existing2 === nodeId) deps.nodeTokens.revoke(token2);
-      }
-      const token = deps.nodeTokens.issue(nodeId);
+      const requestedId = body.nodeId?.trim();
+      const existing = requestedId ? await deps.nodeStore.getNode(requestedId) : null;
+      const nodeId = existing?.id ?? requestedId ?? `node-${(0, import_node_crypto9.randomUUID)().slice(0, 8)}`;
+      const enroll = deps.enrollTokens.issue(nodeId);
       if (nodeName) nodeNames.set(nodeId, nodeName);
-      const existing = await deps.nodeStore.getNode(nodeId);
-      await deps.nodeStore.upsertNode({
-        id: nodeId,
-        name: nodeName,
-        hostname: existing?.hostname ?? "unknown",
-        nodeVersion: existing?.nodeVersion ?? "unknown",
-        status: "offline",
-        lastSeenAt: existing?.lastSeenAt ?? (/* @__PURE__ */ new Date()).toISOString(),
-        enrolledAt: existing?.enrolledAt ?? (/* @__PURE__ */ new Date()).toISOString()
-      });
-      const params = { gatewayUrl: deps.gatewayUrl, nodeId, token, repoRemote: deps.repoRemote };
+      if (existing && nodeName) await deps.nodeStore.updateNodeName(nodeId, nodeName);
+      const params = { gatewayUrl: deps.gatewayUrl, nodeId, token: enroll.token, repoRemote: deps.repoRemote };
       const script = body.platform === "windows" ? buildWindowsConnectScript(params) : buildConnectScript(params);
-      const npxCmd = buildNpxCmd({ gatewayUrl: deps.gatewayUrl, nodeId, token, nodeName });
-      return { status: 200, body: { nodeId, nodeName, token, script, gatewayUrl: deps.gatewayUrl, npxCmd } };
+      const npxCmd = buildNpxCmd({ gatewayUrl: deps.gatewayUrl, nodeId, token: enroll.token, nodeName });
+      return { status: 200, body: { nodeId, nodeName, token: enroll.token, script, gatewayUrl: deps.gatewayUrl, npxCmd } };
+    });
+    router.post("/api/nodes/exchange", async (req) => {
+      const body = req.body ?? {};
+      const enrollToken = body.enrollToken?.trim();
+      if (!enrollToken) return { status: 400, body: { error: "missing enrollToken" } };
+      const consumed = deps.enrollTokens.consume(enrollToken);
+      if (!consumed) return { status: 401, body: { error: "invalid or expired enroll token" } };
+      const nodeId = body.nodeId?.trim() || consumed.nodeId;
+      const existing = deps.nodeTokens.list().find((e) => e.nodeId === nodeId);
+      const token = existing?.token ?? deps.nodeTokens.issue(nodeId);
+      return { status: 200, body: { nodeId, token } };
     });
     router.patch("/api/nodes/:nodeId", async (req) => {
       const nodeId = req.params["nodeId"];
@@ -27750,7 +27859,15 @@ function buildWorkorderDetail(model, workspaceId, resolveActor, resolveProject,
   const activity = buildActivity(model, arts, ref);
   const acceptance = buildAcceptance(model, arts);
   const planning = planningStatusOf(model, arts);
-  return { summary, graph: { nodes, edges }, activity, acceptance, planning };
+  const spec = workorderSpecOf(model, arts);
+  return {
+    summary,
+    graph: { nodes, edges },
+    activity,
+    acceptance,
+    ...spec?.acceptanceCriteria ? { acceptanceCriteria: spec.acceptanceCriteria } : {},
+    planning
+  };
 }
 function buildRuntimeByArtifact(entries, ref) {
   const byJob = /* @__PURE__ */ new Map();
@@ -29736,6 +29853,7 @@ var init_src4 = __esm({
     init_sender();
     init_routes4();
     init_node_store();
+    init_tokens();
     init_collab();
     init_trace2();
     init_chat_sessions();
@@ -35235,7 +35353,9 @@ function buildClaudeUsage(acc) {
 }
 function scrubLeakyEnv(env) {
   const LEAKY = /^npm_|^PNPM_|^INIT_CWD$|^OLDPWD$/;
-  return Object.fromEntries(Object.entries(env).filter(([k]) => !LEAKY.test(k)));
+  const out = Object.fromEntries(Object.entries(env).filter(([k]) => !LEAKY.test(k)));
+  if (out["ANTHROPIC_AUTH_TOKEN"]) delete out["ANTHROPIC_API_KEY"];
+  return out;
 }
 function classifyExit(result) {
   if (!result) return void 0;
@@ -38898,7 +39018,6 @@ async function buildActorProvision(service, actorId) {
   if (raw["FEISHU_APP_ID"] && raw["FEISHU_APP_SECRET"]) {
     try {
       const feishu = new FeishuConnector();
-      await feishu.connect({ app_id: raw["FEISHU_APP_ID"], app_secret: raw["FEISHU_APP_SECRET"] });
       const sessionEnv = /* @__PURE__ */ new Map();
       await feishu.inject({ app_id: raw["FEISHU_APP_ID"], app_secret: raw["FEISHU_APP_SECRET"] }, sessionEnv);
       for (const [k, v] of sessionEnv) env[k] = v;
@@ -38991,6 +39110,7 @@ async function startServe(opts) {
   const operatorToken = issuer.issue(operatorActor);
   fs13.writeFileSync(path11.join(opts.dir, "operator-token"), operatorToken, { mode: 384 });
   const nodeTokens = createNodeTokenStore(path11.join(opts.dir, "node-tokens.json"));
+  const enrollTokens = createEnrollTokenStore();
   const nodeStore = await FileNodeStore.open(path11.join(opts.dir, "nodes.json"));
   const registryAuditFile = path11.join(opts.dir, "registry-audit.ndjson");
   const registryListeners = /* @__PURE__ */ new Set();
@@ -39238,6 +39358,7 @@ async function startServe(opts) {
       nodesDomain({
         getHub: () => hub,
         nodeTokens,
+        enrollTokens,
         nodeStore,
         gatewayUrl: opts.gatewayUrl ?? `ws://127.0.0.1:${opts.port ?? 7320}/node-gateway`,
         repoRemote: opts.nodeRepoRemote ?? "git@github.com:open-friday/oasis-core.git"
@@ -39979,7 +40100,7 @@ var USAGE = `oasis \u2014\u2014 artifact-centric \u534F\u4F5C\u5185\u6838 CLI\uF
   accept    <artifactId> [--note "\u2026"]               # \u5B9A\u7A3F\uFF08\u5148 conclude \u518D accept\uFF09
   assign    <artifactId> --owner <actorId>
   gc                                                # \u5B64\u513F blob \u56DE\u6536\uFF08mark-and-sweep\uFF1B\u64CD\u4F5C\u8005\u547D\u4EE4\uFF0CF1\uFF09
-  \u8BFB\u4EA7\u7269: status <id>\uFF08\u72B6\u6001\u7D22\u5F15\uFF0C\u4E0D\u542B\u6B63\u6587\uFF09/ content <id> [path]\uFF08\u5B9E\u9645\u5185\u5BB9\uFF0C\u591A\u6587\u4EF6\u7ED9 path \u53D6\u5355\u4E2A\uFF09/ project <id>\uFF08\u9879\u76EE\u76EE\u5F55\uFF09   # \u7ED9 agent\uFF0C\u6E10\u8FDB\u62AB\u9732
+  \u8BFB\u4EA7\u7269: status <id>\uFF08\u72B6\u6001\u7D22\u5F15\uFF0C\u4E0D\u542B\u6B63\u6587\uFF09/ content <id> [path]\uFF08\u5B9E\u9645\u5185\u5BB9\uFF0C\u591A\u6587\u4EF6\u7ED9 path \u53D6\u5355\u4E2A\uFF09/ projects [--search q]\uFF08\u5217/\u641C\u9879\u76EE\uFF09/ project <id>\uFF08\u9879\u76EE\u76EE\u5F55\uFF09   # \u7ED9 agent\uFF0C\u6E10\u8FDB\u62AB\u9732
   graph / show / log / ls                          # \u5168\u5C40/\u8BE6\u5C3D\u89C6\u56FE\uFF08\u534F\u8C03\u8005\u3001\u4EBA\uFF1Bls \u4EC5\u534F\u8C03\u8005\uFF09
 
   \u6CBB\u7406\uFF08\xA711\uFF09
@@ -40369,6 +40490,16 @@ async function runCli(argv, println = console.log) {
     return;
   }
   switch (command) {
+    case "projects": {
+      const res = await api.request("GET", "/api/projects");
+      const q = flags.get("search")?.trim().toLowerCase();
+      const items = q ? res.items.filter((p) => `${p.project_id} ${p.name} ${p.description ?? ""}`.toLowerCase().includes(q)) : res.items;
+      println(`\u9879\u76EE(${items.length}${q ? ` / \u641C\u300C${q}\u300D` : ""})\u2014\u2014\u8BE6\u60C5\u7528 \`oasis project <id>\`\u3001\u6CA1\u5408\u9002\u7684\u53EF \`oasis project create\`:`);
+      for (const p of items) println(`- ${p.project_id}  ${p.name}${p.description ? `  \u76EE\u6807: ${p.description}` : ""}`);
+      if (items.length === 0) println("\uFF08\u65E0\u5339\u914D\u2014\u2014\u53EF project create \u65B0\u5EFA\uFF0C\u6216\u5411\u7528\u6237\u6F84\u6E05\uFF09");
+      if (res.next_cursor) println("\uFF08\u8FD8\u6709\u66F4\u591A\u9879\u76EE\u672A\u5217\u5168\uFF0C\u7528 --search \u7F29\u5C0F\u8303\u56F4\uFF09");
+      break;
+    }
     case "project": {
       const projSub = positional[0];
       if (projSub && !["create", "docs", "progress", "run-state"].includes(projSub)) {
@@ -41129,13 +41260,27 @@ void (async () => {
   if (cmd === "start") {
     const prev = readConfig();
     const serverUrl = flags.get("server-ws") ?? process.env["OASIS_SERVER_WS"] ?? prev?.serverUrl;
-    const token = flags.get("token") ?? process.env["OASIS_NODE_TOKEN"] ?? prev?.token;
-    if (!serverUrl || !token) {
-      console.error("Usage: oasis start --server-ws <wss://...> --token <token> [--name <name>] [--id <nodeId>]");
+    if (!serverUrl) {
+      console.error("Usage: oasis start --server-ws <wss://...> (--enroll-token <ent_...> | --token <ont_...>) [--name <name>] [--id <nodeId>]");
+      process.exit(1);
+    }
+    const nodeId = prev?.nodeId ?? flags.get("id") ?? `node-${(0, import_node_crypto21.randomUUID)()}`;
+    let token = flags.get("token") ?? process.env["OASIS_NODE_TOKEN"] ?? prev?.token;
+    const enrollToken = flags.get("enroll-token") ?? process.env["OASIS_ENROLL_TOKEN"];
+    if (enrollToken) {
+      const res = await fetch(`${httpBase(serverUrl)}/api/nodes/exchange`, {
+        method: "POST",
+        headers: { "content-type": "application/json" },
+        body: JSON.stringify({ enrollToken, nodeId })
+      });
+      if (!res.ok) throw new Error(`enroll token exchange failed: HTTP ${res.status}`);
+      const body = await res.json();
+      token = body.token;
+    }
+    if (!token) {
+      console.error("Usage: oasis start --server-ws <wss://...> (--enroll-token <ent_...> | --token <ont_...>) [--name <name>] [--id <nodeId>]");
       process.exit(1);
     }
-    const isReEnrollment = flags.get("token") && flags.get("token") !== prev?.token;
-    const nodeId = isReEnrollment ? flags.get("id") ?? prev?.nodeId ?? `node-${(0, import_node_crypto21.randomUUID)()}` : prev?.nodeId ?? flags.get("id") ?? `node-${(0, import_node_crypto21.randomUUID)()}`;
     const name = flags.get("name") ?? prev?.name;
     const nameChanged = prev?.name !== void 0 && name !== prev.name;
     saveConfig({ serverUrl, token, nodeId, ...name ? { name } : {} });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oasis_test",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "Oasis node daemon + CLI — background daemon, auto-start, full server CLI",
   "bin": { "oasis": "./dist/index.js" },
   "files": ["dist"],