npm - @clawos-dev/clawd - Versions diffs - 0.2.220 → 0.2.221-beta.432.4424967 - Mend

@clawos-dev/clawd 0.2.220 → 0.2.221-beta.432.4424967

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/cli.cjs +179 -42
package/dist/share-ui/assets/{guest-DqLSkH6e.js → guest-ZjGuFfc2.js} +119 -119
package/dist/share-ui/guest.html +1 -1
package/dist/ticket/mcp-server.cjs +76 -33
package/package.json +1 -1

package/dist/share-ui/guest.html CHANGED Viewed

@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Clawd 分享</title>
-    <script type="module" crossorigin src="/share-ui/assets/guest-DqLSkH6e.js"></script>
+    <script type="module" crossorigin src="/share-ui/assets/guest-ZjGuFfc2.js"></script>
     <link rel="stylesheet" crossorigin href="/share-ui/assets/guest-CuXP1xCR.css">
   </head>
   <body style="margin: 0">

package/dist/ticket/mcp-server.cjs CHANGED Viewed

@@ -6899,7 +6899,9 @@ __export(mcp_server_exports, {
   handleOpenPr: () => handleOpenPr,
   handleReleaseTicket: () => handleReleaseTicket,
   handleStartTicket: () => handleStartTicket,
-  handleUpdateTicket: () => handleUpdateTicket
+  handleUpdateTicket: () => handleUpdateTicket,
+  makeCallerAwareHandler: () => makeCallerAwareHandler,
+  resolveTicketCaller: () => resolveTicketCaller
 });
 module.exports = __toCommonJS(mcp_server_exports);
 var import_node_fs = __toESM(require("fs"), 1);
@@ -21236,36 +21238,75 @@ async function handleOpenPr(input, client) {
 async function handleAbandonTicket(input, client) {
   return unwrap(await client.call("POST", `/tickets/${encodeURIComponent(input.id)}/abandon`, {}));
 }
-function readCtxFromEnv() {
-  const apiUrl = process.env.CLAWD_TICKET_API_URL ?? "";
-  const apiKey = process.env.CLAWD_TICKET_API_KEY ?? "";
-  const did = process.env.CLAWD_TICKET_DID ?? "";
-  const name = process.env.CLAWD_TICKET_NAME ?? "";
-  const sceneRaw = process.env.CLAWD_TICKET_SCENE ?? "persona";
-  const scene = sceneRaw === "daemon" || sceneRaw === "ci" || sceneRaw === "persona" ? sceneRaw : "persona";
-  if (!apiUrl || !apiKey || !did) {
-    logLine("startup: missing env", {
-      hasApiUrl: !!apiUrl,
-      hasApiKey: !!apiKey,
-      hasDid: !!did,
-      hasName: !!name,
-      scene
+async function resolveTicketCaller(opts = {}) {
+  const daemonUrl = process.env.CLAWD_DAEMON_URL;
+  const sessionId = process.env.CLAWD_SESSION_ID;
+  if (!daemonUrl || !sessionId) {
+    logLine("resolveCaller: env missing", { hasDaemonUrl: !!daemonUrl, hasSessionId: !!sessionId });
+    return null;
+  }
+  const f = opts.fetch ?? fetch;
+  let res;
+  try {
+    res = await f(`${daemonUrl}/api/rpc/session.currentTurnSender`, {
+      method: "POST",
+      headers: { "content-type": "application/json", "x-clawd-session-id": sessionId },
+      body: "{}"
     });
+  } catch (err) {
+    logLine("resolveCaller: fetch threw", { err: String(err) });
+    return null;
   }
-  return { apiUrl, apiKey, did, name, scene };
+  if (!res.ok) {
+    logLine("resolveCaller: non-2xx", { status: res.status });
+    return null;
+  }
+  let json;
+  try {
+    json = await res.json();
+  } catch {
+    logLine("resolveCaller: non-JSON");
+    return null;
+  }
+  const sender = json?.result?.sender;
+  if (!sender?.did || !sender?.displayName) {
+    logLine("resolveCaller: no active sender", { hasSender: !!sender });
+    return null;
+  }
+  return { did: sender.did, name: sender.displayName };
+}
+function makeCallerAwareHandler(logic, deps = {}) {
+  return async (input) => {
+    const resolve = deps.resolveCaller ?? resolveTicketCaller;
+    const caller = await resolve();
+    if (!caller) {
+      return fail(
+        "no active sender: ticket call rejected (session.currentTurnSender returned no caller)"
+      );
+    }
+    const sceneRaw = process.env.CLAWD_TICKET_SCENE ?? "persona";
+    const scene = sceneRaw === "daemon" || sceneRaw === "ci" || sceneRaw === "persona" ? sceneRaw : "persona";
+    const client = makeTicketApiClient({
+      apiUrl: process.env.CLAWD_TICKET_API_URL ?? "",
+      apiKey: process.env.CLAWD_TICKET_API_KEY ?? "",
+      did: caller.did,
+      name: caller.name,
+      scene
+    });
+    return logic(input, client);
+  };
 }
 async function main() {
-  const ctx = readCtxFromEnv();
   logLine("startup: server boot", {
     server: SERVER_NAME,
     version: SERVER_VERSION,
-    apiUrl: ctx.apiUrl,
-    did: ctx.did,
-    callerName: ctx.name,
-    scene: ctx.scene,
+    apiUrl: process.env.CLAWD_TICKET_API_URL ?? "",
+    hasApiKey: !!process.env.CLAWD_TICKET_API_KEY,
+    daemonUrl: process.env.CLAWD_DAEMON_URL ?? "(missing)",
+    sessionId: process.env.CLAWD_SESSION_ID ?? "(missing)",
+    scene: process.env.CLAWD_TICKET_SCENE ?? "persona",
     logTarget: TICKET_LOG ?? "stderr (no CLAWD_TICKET_LOG env)"
   });
-  const client = makeTicketApiClient(ctx);
   const server = new McpServer({ name: SERVER_NAME, version: SERVER_VERSION });
   const TICKET_STATUS_ENUM = [
     "open",
@@ -21284,7 +21325,7 @@ async function main() {
       summary: external_exports.string().min(1),
       type: external_exports.enum(TICKET_TYPE_ENUM)
     },
-    async (input) => handleCreateTicket(input, client)
+    makeCallerAwareHandler(handleCreateTicket)
   );
   server.tool(
     "list_tickets",
@@ -21294,13 +21335,13 @@ async function main() {
       all: external_exports.boolean().optional(),
       version: external_exports.string().optional()
     },
-    async (input) => handleListTickets(input, client)
+    makeCallerAwareHandler(handleListTickets)
   );
   server.tool(
     "get_ticket",
     "Get one ticket by id (T-<num>).",
     { id: external_exports.string().min(1) },
-    async (input) => handleGetTicket(input, client)
+    makeCallerAwareHandler(handleGetTicket)
   );
   server.tool(
     "update_ticket",
@@ -21312,19 +21353,19 @@ async function main() {
       release_note: external_exports.string().nullable().optional(),
       type: external_exports.enum(TICKET_TYPE_ENUM).optional()
     },
-    async (input) => handleUpdateTicket(input, client)
+    makeCallerAwareHandler(handleUpdateTicket)
   );
   server.tool(
     "claim_ticket",
     "Claim an unassigned ticket (status open \u2192 claimed). Fails 409 ASSIGNEE_LOCKED if already taken.",
     { id: external_exports.string().min(1) },
-    async (input) => handleClaimTicket(input, client)
+    makeCallerAwareHandler(handleClaimTicket)
   );
   server.tool(
     "release_ticket",
     "Release a ticket back to unassigned (status \u2192 open). Only current assignee or requester can release. Precondition to reassigning (\u5148\u91CA\u653E\u518D\u8BA4\u9886).",
     { id: external_exports.string().min(1) },
-    async (input) => handleReleaseTicket(input, client)
+    makeCallerAwareHandler(handleReleaseTicket)
   );
   server.tool(
     "assign_ticket",
@@ -21334,13 +21375,13 @@ async function main() {
       assignee_did: external_exports.string().min(1),
       assignee_name: external_exports.string().min(1)
     },
-    async (input) => handleAssignTicket(input, client)
+    makeCallerAwareHandler(handleAssignTicket)
   );
   server.tool(
     "start_ticket",
     "Move a ticket claimed \u2192 in_progress. Only the current assignee can start.",
     { id: external_exports.string().min(1) },
-    async (input) => handleStartTicket(input, client)
+    makeCallerAwareHandler(handleStartTicket)
   );
   server.tool(
     "open_pr",
@@ -21349,13 +21390,13 @@ async function main() {
       id: external_exports.string().min(1),
       pr_url: external_exports.string().url()
     },
-    async (input) => handleOpenPr(input, client)
+    makeCallerAwareHandler(handleOpenPr)
   );
   server.tool(
     "abandon_ticket",
     "Requester abandons a ticket (any non-shipped status \u2192 abandoned). Terminal state.",
     { id: external_exports.string().min(1) },
-    async (input) => handleAbandonTicket(input, client)
+    makeCallerAwareHandler(handleAbandonTicket)
   );
   const transport = new StdioServerTransport();
   await server.connect(transport);
@@ -21378,5 +21419,7 @@ if (require.main === module) {
   handleOpenPr,
   handleReleaseTicket,
   handleStartTicket,
-  handleUpdateTicket
+  handleUpdateTicket,
+  makeCallerAwareHandler,
+  resolveTicketCaller
 });

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@clawos-dev/clawd",
-  "version": "0.2.220",
+  "version": "0.2.221-beta.432.4424967",
   "description": "Standalone clawd daemon — Claude Code (and future Codex) session server over WebSocket",
   "type": "module",
   "license": "MIT",