@clawos-dev/clawd 0.2.71-beta.126.06f4cfa → 0.2.71-beta.128.2805736

package/dist/cli.cjs

@@ -133,6 +133,11 @@ var init_methods = __esm({
       "remote-persona:add",
       "remote-persona:list",
       "remote-persona:remove",
+      // ---- whoami (v2 capability platform) ----
+      // 任何 authed connection 都能调；返回 owner 显示名 + 当前 capability wire 形态 +
+      // grants 对应的 persona 元数据 (id + displayName)。UI 端 AddRemotePersonaDialog
+      // 的 preview 一次性临时 client 用它判定身份和可用 persona。
+      "whoami",
       "info",
       "ping"
     ];
@@ -5086,7 +5091,7 @@ function stripSecretHash(cap) {
   const { secretHash: _hash, ...wire } = cap;
   return wire;
 }
-var ResourceSchema, ActionSchema, GrantSchema, CapabilitySchema, CapabilityWireSchema, CapabilityErrorCodeSchema;
+var ResourceSchema, ActionSchema, GrantSchema, CapabilitySchema, CapabilityWireSchema, CapabilityErrorCodeSchema, WhoamiResponseSchema;
 var init_capability = __esm({
   "../protocol/src/capability.ts"() {
     "use strict";
@@ -5121,6 +5126,21 @@ var init_capability = __esm({
       "TOKEN_EXPIRED",
       "TOKEN_EXHAUSTED"
     ]);
+    WhoamiResponseSchema = external_exports.object({
+      type: external_exports.literal("whoami:ok"),
+      owner: external_exports.object({
+        id: external_exports.string(),
+        kind: external_exports.enum(["owner", "guest"]),
+        displayName: external_exports.string()
+      }).strict(),
+      capability: CapabilityWireSchema,
+      grantedPersonas: external_exports.array(
+        external_exports.object({
+          id: external_exports.string().min(1),
+          displayName: external_exports.string()
+        }).strict()
+      )
+    }).strict();
   }
 });
 
@@ -26156,6 +26176,11 @@ var CapabilityManager = class {
   list() {
     return this.registry.list();
   }
+  // whoami handler 用：根据 capabilityId 反查 caller 的 capability 实体。
+  // 返回 Capability 持久化形态；handler 调 stripSecretHash 后再上 wire。
+  findById(id) {
+    return this.registry.findById(id);
+  }
   issue(args) {
     if (!args.displayName.trim()) {
       throw new Error("CapabilityManager.issue: displayName must be non-empty");
@@ -28370,15 +28395,18 @@ var RevokeArgsSchema = external_exports.object({
   capabilityId: external_exports.string().min(1)
 }).strict();
 function buildCapabilityHandlers(deps) {
-  const { manager } = deps;
+  const { manager, getShareBaseUrl } = deps;
   const issue = async (frame) => {
     const { type: _type, requestId: _requestId, ...rest } = frame;
     const args = IssueArgsSchema.parse(rest);
     const { token, capability } = manager.issue(args);
+    const base = getShareBaseUrl().replace(/\/$/, "");
+    const shareUrl = `${base}/?token=${encodeURIComponent(token)}`;
     return {
       response: {
         type: "capability:issued",
         token,
+        shareUrl,
         capability: stripSecretHash(capability)
       }
     };
@@ -28499,12 +28527,13 @@ function buildRemotePersonaHandlers(deps) {
       response: { type: "remote-persona:add:ok", remotePersona: stripRemotePersonaSecret(rp) }
     };
   };
-  const list = async () => {
+  const list = async (_frame, _client, ctx) => {
     const all = store.list();
+    const projected = ctx?.principal.kind === "owner" ? all : all.map(stripRemotePersonaSecret);
     return {
       response: {
         type: "remote-persona:list",
-        remotePersonas: all.map(stripRemotePersonaSecret)
+        remotePersonas: projected
       }
     };
   };
@@ -28523,6 +28552,51 @@ function buildRemotePersonaHandlers(deps) {
   };
 }
 
+// src/handlers/whoami.ts
+init_protocol();
+function buildWhoamiHandler(deps) {
+  return async (_frame, _client, ctx) => {
+    if (!ctx) {
+      throw new ClawdError(ERROR_CODES.INTERNAL, "whoami: missing ConnectionContext");
+    }
+    const owner = { ...OWNER_PRINCIPAL, displayName: deps.ownerDisplayName };
+    let capability;
+    if (ctx.principal.kind === "owner") {
+      capability = {
+        id: "owner",
+        displayName: deps.ownerDisplayName,
+        grants: ctx.grants,
+        issuedAt: 0,
+        usedCount: 0
+      };
+    } else {
+      if (!ctx.capabilityId) {
+        throw new ClawdError(ERROR_CODES.UNAUTHORIZED, "whoami: guest ctx without capabilityId");
+      }
+      const cap = deps.capabilityManager.findById(ctx.capabilityId);
+      if (!cap) {
+        throw new ClawdError(ERROR_CODES.UNAUTHORIZED, `whoami: capability not found: ${ctx.capabilityId}`);
+      }
+      capability = stripSecretHash(cap);
+    }
+    const grantedPersonas = [];
+    for (const g2 of capability.grants) {
+      if (g2.resource.type !== "persona") continue;
+      const file = deps.personaStore.read(g2.resource.id);
+      if (!file) continue;
+      grantedPersonas.push({ id: file.personaId, displayName: file.label });
+    }
+    return {
+      response: {
+        type: "whoami:ok",
+        owner,
+        capability,
+        grantedPersonas
+      }
+    };
+  };
+}
+
 // src/handlers/meta.ts
 var import_node_os13 = __toESM(require("os"), 1);
 init_protocol();
@@ -28774,12 +28848,20 @@ function buildMethodHandlers(deps) {
       personaManager: deps.personaManager,
       personaRegistry: deps.personaRegistry
     }),
-    ...buildCapabilityHandlers({ manager: deps.capabilityManager }),
+    ...buildCapabilityHandlers({
+      manager: deps.capabilityManager,
+      getShareBaseUrl: deps.getShareBaseUrl
+    }),
     ...buildInboxHandlers({
       manager: deps.inboxManager,
       capabilityRegistry: deps.capabilityRegistry
     }),
     ...buildRemotePersonaHandlers({ store: deps.remotePersonaStore }),
+    whoami: buildWhoamiHandler({
+      ownerDisplayName: deps.ownerDisplayName,
+      personaStore: deps.personaStore,
+      capabilityManager: deps.capabilityManager
+    }),
     ...deps.attachment ? buildAttachmentHandlers(deps.attachment) : {}
   };
 }
@@ -28794,6 +28876,10 @@ var METHOD_GRANT_MAP = {
   // ---- public（meta-only，guest 也能调） ----
   "info": { kind: "public" },
   "ping": { kind: "public" },
+  // v2 Phase 6: whoami 是身份反查，任何 authed connection (owner / guest) 都能调；
+  // handler 内部按 ctx.principal.kind 决定返回 "合成 owner self capability" 还是
+  // "查 capabilityManager 拿 caller 的 guest capability"。
+  "whoami": { kind: "public" },
   // ---- capability platform（admin-only，本 PR 新增） ----
   "capability:issue": ADMIN_ANY,
   "capability:list": ADMIN_ANY,
@@ -29140,6 +29226,12 @@ async function startDaemon(config) {
     },
     // Task 1.9: capability:issue/list/revoke handler 依赖
     capabilityManager,
+    // v2 Phase 5: capability:issue 返回的 shareUrl 用此 base URL 拼接。
+    // tunnel 拉起后切到反代 wss://... 地址；否则本机 ws://host:port。
+    getShareBaseUrl: () => currentTunnelUrl ?? `ws://${config.host}:${config.port}`,
+    // v2 Phase 6: whoami handler 装在 owner principal.displayName + persona 解析
+    ownerDisplayName,
+    personaStore,
     // Phase 4 Task 4.2: inbox:postMessage 要查 capabilityRegistry 解析 peer Principal
     capabilityRegistry,
     // Phase 3 Task 3.4: inbox:list/markRead handler 依赖

package/package.json

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