@clawos-dev/clawd 0.2.71-beta.135.eac0f51 → 0.2.71-beta.137.a346461

package/dist/cli.cjs

@@ -142,13 +142,10 @@ var init_methods = __esm({
       //   - list 返回 PersonWithLinks[]（含派生 linkedCapabilityIds / linkedRemoteAliases）
       //   - create / update / delete 操作 Person 实体（delete 触发 cascade：revoke 全部
       //     linked cap + remove subscribed alias + clear linked inbox events）
-      //   - link 重新指向某 principal 到目标 personId（手动合并 / 重链入口；自动 link
-      //     在 capability:issue / remote-persona:add handler 内部直接写 PersonAliasStore）
       "person:list",
       "person:create",
       "person:update",
-      "person:delete",
-      "person:link"
+      "person:delete"
     ];
   }
 });
@@ -638,8 +635,8 @@ var init_parseUtil = __esm({
     init_errors2();
     init_en();
     makeIssue = (params) => {
-      const { data, path: path39, errorMaps, issueData } = params;
-      const fullPath = [...path39, ...issueData.path || []];
+      const { data, path: path38, errorMaps, issueData } = params;
+      const fullPath = [...path38, ...issueData.path || []];
       const fullIssue = {
         ...issueData,
         path: fullPath
@@ -950,11 +947,11 @@ var init_types = __esm({
     init_parseUtil();
     init_util();
     ParseInputLazyPath = class {
-      constructor(parent, value, path39, key) {
+      constructor(parent, value, path38, key) {
         this._cachedPath = [];
         this.parent = parent;
         this.data = value;
-        this._path = path39;
+        this._path = path38;
         this._key = key;
       }
       get path() {
@@ -5113,12 +5110,11 @@ var init_capability = __esm({
       maxUses: external_exports.number().int().positive().optional(),
       usedCount: external_exports.number().int().nonnegative(),
       /**
-       * Person identity Phase 1: guest 真实身份。
-       * - 纯访客 / 尚未 authenticate 时 undefined
-       * - guest authenticate 上报 selfPrincipalId 后 daemon 落入此字段（immutable，不允许 owner 修改）
-       * - PersonAliasStore 的 alias key 来源优先 linkedPrincipalId，否则 fallback cap.id
+       * Person identity per-People token (2026-05-21): cap 直接绑死 Person 主人。
+       * 一 Person 一 cap：capability:issue 同 person 第二次调用 = 合并 grants，
+       * 不新建 cap。删 PersonAlias 表整套（cap.personId 直接含信息，无需反查）。
        */
-      linkedPrincipalId: external_exports.string().min(1).optional()
+      personId: external_exports.string().min(1)
     }).strict();
     CapabilityWireSchema = CapabilitySchema.omit({ secretHash: true });
     CapabilityErrorCodeSchema = external_exports.enum([
@@ -5208,7 +5204,12 @@ var init_remote_persona = __esm({
       remoteDisplayName: external_exports.string(),
       ownerDisplayName: external_exports.string().optional(),
       addedAt: external_exports.number().int().nonnegative(),
-      lastConnectedAt: external_exports.number().int().positive().optional()
+      lastConnectedAt: external_exports.number().int().positive().optional(),
+      /**
+       * Person identity per-People token (2026-05-21): RemotePersona 直接绑死本地 Person。
+       * 删 PersonAlias 表后由该字段提供"远端 owner principal 对应本地哪个 person"。
+       */
+      personId: external_exports.string().min(1)
     }).strict();
     RemotePersonaWireSchema = RemotePersonaSchema.omit({ capabilityToken: true });
     RemotePersonaAddArgsSchema = external_exports.object({
@@ -5223,9 +5224,8 @@ var init_remote_persona = __esm({
       remoteDisplayName: external_exports.string(),
       ownerDisplayName: external_exports.string().optional(),
       /**
-       * Person identity Phase 1: add 时必须关联到一个 Person（owner 视角的"对方是谁"）。
-       * daemon handler 内 atomic 写 RemotePersona + 写 PersonAliasStore
-       * (alias key = ownerPrincipalId)。
+       * Person identity per-People token: add 时必须关联到一个 Person（owner 视角的"对方是谁"）。
+       * daemon handler 内 atomic 写 RemotePersona.personId（PersonAlias 表 2026-05-21 删除）。
        */
       personId: external_exports.string().min(1)
     }).strict();
@@ -5236,7 +5236,7 @@ var init_remote_persona = __esm({
 });
 
 // ../protocol/src/person.ts
-var PersonSchema, PersonAliasSchema, PersonWithLinksSchema, PersonCreateArgsSchema, PersonUpdateArgsSchema, PersonDeleteArgsSchema, PersonLinkArgsSchema, PersonListResponseSchema, PersonCreateResponseSchema, PersonUpdateResponseSchema, PersonDeleteResponseSchema, PersonLinkResponseSchema;
+var PersonSchema, PersonWithLinksSchema, PersonCreateArgsSchema, PersonUpdateArgsSchema, PersonDeleteArgsSchema, PersonListResponseSchema, PersonCreateResponseSchema, PersonUpdateResponseSchema, PersonDeleteResponseSchema;
 var init_person = __esm({
   "../protocol/src/person.ts"() {
     "use strict";
@@ -5250,10 +5250,6 @@ var init_person = __esm({
       createdAt: external_exports.number().int().nonnegative(),
       updatedAt: external_exports.number().int().nonnegative()
     }).strict();
-    PersonAliasSchema = external_exports.object({
-      principalId: external_exports.string().min(1),
-      personId: external_exports.string().min(1)
-    }).strict();
     PersonWithLinksSchema = PersonSchema.extend({
       linkedCapabilityIds: external_exports.array(external_exports.string()),
       linkedRemoteAliases: external_exports.array(external_exports.string())
@@ -5273,10 +5269,6 @@ var init_person = __esm({
     PersonDeleteArgsSchema = external_exports.object({
       id: external_exports.string().min(1)
     }).strict();
-    PersonLinkArgsSchema = external_exports.object({
-      principalId: external_exports.string().min(1),
-      personId: external_exports.string().min(1)
-    }).strict();
     PersonListResponseSchema = external_exports.object({
       type: external_exports.literal("person:list:ok"),
       persons: external_exports.array(PersonWithLinksSchema)
@@ -5298,9 +5290,6 @@ var init_person = __esm({
       /** cascade 清掉了多少条 inbox 事件 */
       deletedInboxEvents: external_exports.number().int().nonnegative()
     }).strict();
-    PersonLinkResponseSchema = external_exports.object({
-      type: external_exports.literal("person:link:ok")
-    }).strict();
   }
 });
 
@@ -5595,8 +5584,8 @@ var require_req = __commonJS({
       if (req.originalUrl) {
         _req.url = req.originalUrl;
       } else {
-        const path39 = req.path;
-        _req.url = typeof path39 === "string" ? path39 : req.url ? req.url.path || req.url : void 0;
+        const path38 = req.path;
+        _req.url = typeof path38 === "string" ? path38 : req.url ? req.url.path || req.url : void 0;
       }
       if (req.query) {
         _req.query = req.query;
@@ -5761,14 +5750,14 @@ var require_redact = __commonJS({
       }
       return obj;
     }
-    function parsePath(path39) {
+    function parsePath(path38) {
       const parts = [];
       let current = "";
       let inBrackets = false;
       let inQuotes = false;
       let quoteChar = "";
-      for (let i = 0; i < path39.length; i++) {
-        const char = path39[i];
+      for (let i = 0; i < path38.length; i++) {
+        const char = path38[i];
         if (!inBrackets && char === ".") {
           if (current) {
             parts.push(current);
@@ -5899,10 +5888,10 @@ var require_redact = __commonJS({
       return current;
     }
     function redactPaths(obj, paths, censor, remove = false) {
-      for (const path39 of paths) {
-        const parts = parsePath(path39);
+      for (const path38 of paths) {
+        const parts = parsePath(path38);
         if (parts.includes("*")) {
-          redactWildcardPath(obj, parts, censor, path39, remove);
+          redactWildcardPath(obj, parts, censor, path38, remove);
         } else {
           if (remove) {
             removeKey(obj, parts);
@@ -5987,8 +5976,8 @@ var require_redact = __commonJS({
           }
         } else {
           if (afterWildcard.includes("*")) {
-            const wrappedCensor = typeof censor === "function" ? (value, path39) => {
-              const fullPath = [...pathArray.slice(0, pathLength), ...path39];
+            const wrappedCensor = typeof censor === "function" ? (value, path38) => {
+              const fullPath = [...pathArray.slice(0, pathLength), ...path38];
               return censor(value, fullPath);
             } : censor;
             redactWildcardPath(current, afterWildcard, wrappedCensor, originalPath, remove);
@@ -6023,8 +6012,8 @@ var require_redact = __commonJS({
         return null;
       }
       const pathStructure = /* @__PURE__ */ new Map();
-      for (const path39 of pathsToClone) {
-        const parts = parsePath(path39);
+      for (const path38 of pathsToClone) {
+        const parts = parsePath(path38);
         let current = pathStructure;
         for (let i = 0; i < parts.length; i++) {
           const part = parts[i];
@@ -6076,24 +6065,24 @@ var require_redact = __commonJS({
       }
       return cloneSelectively(obj, pathStructure);
     }
-    function validatePath(path39) {
-      if (typeof path39 !== "string") {
+    function validatePath(path38) {
+      if (typeof path38 !== "string") {
         throw new Error("Paths must be (non-empty) strings");
       }
-      if (path39 === "") {
+      if (path38 === "") {
         throw new Error("Invalid redaction path ()");
       }
-      if (path39.includes("..")) {
-        throw new Error(`Invalid redaction path (${path39})`);
+      if (path38.includes("..")) {
+        throw new Error(`Invalid redaction path (${path38})`);
       }
-      if (path39.includes(",")) {
-        throw new Error(`Invalid redaction path (${path39})`);
+      if (path38.includes(",")) {
+        throw new Error(`Invalid redaction path (${path38})`);
       }
       let bracketCount = 0;
       let inQuotes = false;
       let quoteChar = "";
-      for (let i = 0; i < path39.length; i++) {
-        const char = path39[i];
+      for (let i = 0; i < path38.length; i++) {
+        const char = path38[i];
         if ((char === '"' || char === "'") && bracketCount > 0) {
           if (!inQuotes) {
             inQuotes = true;
@@ -6107,20 +6096,20 @@ var require_redact = __commonJS({
         } else if (char === "]" && !inQuotes) {
           bracketCount--;
           if (bracketCount < 0) {
-            throw new Error(`Invalid redaction path (${path39})`);
+            throw new Error(`Invalid redaction path (${path38})`);
           }
         }
       }
       if (bracketCount !== 0) {
-        throw new Error(`Invalid redaction path (${path39})`);
+        throw new Error(`Invalid redaction path (${path38})`);
       }
     }
     function validatePaths(paths) {
       if (!Array.isArray(paths)) {
         throw new TypeError("paths must be an array");
       }
-      for (const path39 of paths) {
-        validatePath(path39);
+      for (const path38 of paths) {
+        validatePath(path38);
       }
     }
     function slowRedact(options = {}) {
@@ -6288,8 +6277,8 @@ var require_redaction = __commonJS({
         if (shape[k2] === null) {
           o[k2] = (value) => topCensor(value, [k2]);
         } else {
-          const wrappedCensor = typeof censor === "function" ? (value, path39) => {
-            return censor(value, [k2, ...path39]);
+          const wrappedCensor = typeof censor === "function" ? (value, path38) => {
+            return censor(value, [k2, ...path38]);
           } : censor;
           o[k2] = Redact({
             paths: shape[k2],
@@ -6507,10 +6496,10 @@ var require_atomic_sleep = __commonJS({
 var require_sonic_boom = __commonJS({
   "../node_modules/.pnpm/sonic-boom@4.2.1/node_modules/sonic-boom/index.js"(exports2, module2) {
     "use strict";
-    var fs35 = require("fs");
+    var fs34 = require("fs");
     var EventEmitter2 = require("events");
     var inherits = require("util").inherits;
-    var path39 = require("path");
+    var path38 = require("path");
     var sleep = require_atomic_sleep();
     var assert = require("assert");
     var BUSY_WRITE_TIMEOUT = 100;
@@ -6564,20 +6553,20 @@ var require_sonic_boom = __commonJS({
       const mode = sonic.mode;
       if (sonic.sync) {
         try {
-          if (sonic.mkdir) fs35.mkdirSync(path39.dirname(file), { recursive: true });
-          const fd = fs35.openSync(file, flags, mode);
+          if (sonic.mkdir) fs34.mkdirSync(path38.dirname(file), { recursive: true });
+          const fd = fs34.openSync(file, flags, mode);
           fileOpened(null, fd);
         } catch (err) {
           fileOpened(err);
           throw err;
         }
       } else if (sonic.mkdir) {
-        fs35.mkdir(path39.dirname(file), { recursive: true }, (err) => {
+        fs34.mkdir(path38.dirname(file), { recursive: true }, (err) => {
           if (err) return fileOpened(err);
-          fs35.open(file, flags, mode, fileOpened);
+          fs34.open(file, flags, mode, fileOpened);
         });
       } else {
-        fs35.open(file, flags, mode, fileOpened);
+        fs34.open(file, flags, mode, fileOpened);
       }
     }
     function SonicBoom(opts) {
@@ -6618,8 +6607,8 @@ var require_sonic_boom = __commonJS({
         this.flush = flushBuffer;
         this.flushSync = flushBufferSync;
         this._actualWrite = actualWriteBuffer;
-        fsWriteSync = () => fs35.writeSync(this.fd, this._writingBuf);
-        fsWrite = () => fs35.write(this.fd, this._writingBuf, this.release);
+        fsWriteSync = () => fs34.writeSync(this.fd, this._writingBuf);
+        fsWrite = () => fs34.write(this.fd, this._writingBuf, this.release);
       } else if (contentMode === void 0 || contentMode === kContentModeUtf8) {
         this._writingBuf = "";
         this.write = write;
@@ -6628,15 +6617,15 @@ var require_sonic_boom = __commonJS({
         this._actualWrite = actualWrite;
         fsWriteSync = () => {
           if (Buffer.isBuffer(this._writingBuf)) {
-            return fs35.writeSync(this.fd, this._writingBuf);
+            return fs34.writeSync(this.fd, this._writingBuf);
           }
-          return fs35.writeSync(this.fd, this._writingBuf, "utf8");
+          return fs34.writeSync(this.fd, this._writingBuf, "utf8");
         };
         fsWrite = () => {
           if (Buffer.isBuffer(this._writingBuf)) {
-            return fs35.write(this.fd, this._writingBuf, this.release);
+            return fs34.write(this.fd, this._writingBuf, this.release);
           }
-          return fs35.write(this.fd, this._writingBuf, "utf8", this.release);
+          return fs34.write(this.fd, this._writingBuf, "utf8", this.release);
         };
       } else {
         throw new Error(`SonicBoom supports "${kContentModeUtf8}" and "${kContentModeBuffer}", but passed ${contentMode}`);
@@ -6693,7 +6682,7 @@ var require_sonic_boom = __commonJS({
           }
         }
         if (this._fsync) {
-          fs35.fsyncSync(this.fd);
+          fs34.fsyncSync(this.fd);
         }
         const len = this._len;
         if (this._reopening) {
@@ -6807,7 +6796,7 @@ var require_sonic_boom = __commonJS({
       const onDrain = () => {
         if (!this._fsync) {
           try {
-            fs35.fsync(this.fd, (err) => {
+            fs34.fsync(this.fd, (err) => {
               this._flushPending = false;
               cb(err);
             });
@@ -6909,7 +6898,7 @@ var require_sonic_boom = __commonJS({
       const fd = this.fd;
       this.once("ready", () => {
         if (fd !== this.fd) {
-          fs35.close(fd, (err) => {
+          fs34.close(fd, (err) => {
             if (err) {
               return this.emit("error", err);
             }
@@ -6958,7 +6947,7 @@ var require_sonic_boom = __commonJS({
           buf = this._bufs[0];
         }
         try {
-          const n = Buffer.isBuffer(buf) ? fs35.writeSync(this.fd, buf) : fs35.writeSync(this.fd, buf, "utf8");
+          const n = Buffer.isBuffer(buf) ? fs34.writeSync(this.fd, buf) : fs34.writeSync(this.fd, buf, "utf8");
           const releasedBufObj = releaseWritingBuf(buf, this._len, n);
           buf = releasedBufObj.writingBuf;
           this._len = releasedBufObj.len;
@@ -6974,7 +6963,7 @@ var require_sonic_boom = __commonJS({
         }
       }
       try {
-        fs35.fsyncSync(this.fd);
+        fs34.fsyncSync(this.fd);
       } catch {
       }
     }
@@ -6995,7 +6984,7 @@ var require_sonic_boom = __commonJS({
           buf = mergeBuf(this._bufs[0], this._lens[0]);
         }
         try {
-          const n = fs35.writeSync(this.fd, buf);
+          const n = fs34.writeSync(this.fd, buf);
           buf = buf.subarray(n);
           this._len = Math.max(this._len - n, 0);
           if (buf.length <= 0) {
@@ -7023,13 +7012,13 @@ var require_sonic_boom = __commonJS({
       this._writingBuf = this._writingBuf.length ? this._writingBuf : this._bufs.shift() || "";
       if (this.sync) {
         try {
-          const written = Buffer.isBuffer(this._writingBuf) ? fs35.writeSync(this.fd, this._writingBuf) : fs35.writeSync(this.fd, this._writingBuf, "utf8");
+          const written = Buffer.isBuffer(this._writingBuf) ? fs34.writeSync(this.fd, this._writingBuf) : fs34.writeSync(this.fd, this._writingBuf, "utf8");
           release(null, written);
         } catch (err) {
           release(err);
         }
       } else {
-        fs35.write(this.fd, this._writingBuf, release);
+        fs34.write(this.fd, this._writingBuf, release);
       }
     }
     function actualWriteBuffer() {
@@ -7038,7 +7027,7 @@ var require_sonic_boom = __commonJS({
       this._writingBuf = this._writingBuf.length ? this._writingBuf : mergeBuf(this._bufs.shift(), this._lens.shift());
       if (this.sync) {
         try {
-          const written = fs35.writeSync(this.fd, this._writingBuf);
+          const written = fs34.writeSync(this.fd, this._writingBuf);
           release(null, written);
         } catch (err) {
           release(err);
@@ -7047,7 +7036,7 @@ var require_sonic_boom = __commonJS({
         if (kCopyBuffer) {
           this._writingBuf = Buffer.from(this._writingBuf);
         }
-        fs35.write(this.fd, this._writingBuf, release);
+        fs34.write(this.fd, this._writingBuf, release);
       }
     }
     function actualClose(sonic) {
@@ -7063,12 +7052,12 @@ var require_sonic_boom = __commonJS({
       sonic._lens = [];
       assert(typeof sonic.fd === "number", `sonic.fd must be a number, got ${typeof sonic.fd}`);
       try {
-        fs35.fsync(sonic.fd, closeWrapped);
+        fs34.fsync(sonic.fd, closeWrapped);
       } catch {
       }
       function closeWrapped() {
         if (sonic.fd !== 1 && sonic.fd !== 2) {
-          fs35.close(sonic.fd, done);
+          fs34.close(sonic.fd, done);
         } else {
           done();
         }
@@ -7325,7 +7314,7 @@ var require_thread_stream = __commonJS({
     var { version: version2 } = require_package();
     var { EventEmitter: EventEmitter2 } = require("events");
     var { Worker } = require("worker_threads");
-    var { join: join12 } = require("path");
+    var { join: join11 } = require("path");
     var { pathToFileURL } = require("url");
     var { wait } = require_wait();
     var {
@@ -7361,7 +7350,7 @@ var require_thread_stream = __commonJS({
     function createWorker(stream, opts) {
       const { filename, workerData } = opts;
       const bundlerOverrides = "__bundlerPathsOverrides" in globalThis ? globalThis.__bundlerPathsOverrides : {};
-      const toExecute = bundlerOverrides["thread-stream-worker"] || join12(__dirname, "lib", "worker.js");
+      const toExecute = bundlerOverrides["thread-stream-worker"] || join11(__dirname, "lib", "worker.js");
       const worker = new Worker(toExecute, {
         ...opts.workerOpts,
         trackUnmanagedFds: false,
@@ -7747,7 +7736,7 @@ var require_transport = __commonJS({
     "use strict";
     var { createRequire } = require("module");
     var getCallers = require_caller();
-    var { join: join12, isAbsolute, sep: sep2 } = require("path");
+    var { join: join11, isAbsolute, sep: sep2 } = require("path");
     var sleep = require_atomic_sleep();
     var onExit = require_on_exit_leak_free();
     var ThreadStream = require_thread_stream();
@@ -7810,7 +7799,7 @@ var require_transport = __commonJS({
         throw new Error("only one of target or targets can be specified");
       }
       if (targets) {
-        target = bundlerOverrides["pino-worker"] || join12(__dirname, "worker.js");
+        target = bundlerOverrides["pino-worker"] || join11(__dirname, "worker.js");
         options.targets = targets.filter((dest) => dest.target).map((dest) => {
           return {
             ...dest,
@@ -7828,7 +7817,7 @@ var require_transport = __commonJS({
           });
         });
       } else if (pipeline2) {
-        target = bundlerOverrides["pino-worker"] || join12(__dirname, "worker.js");
+        target = bundlerOverrides["pino-worker"] || join11(__dirname, "worker.js");
         options.pipelines = [pipeline2.map((dest) => {
           return {
             ...dest,
@@ -7850,7 +7839,7 @@ var require_transport = __commonJS({
           return origin;
         }
         if (origin === "pino/file") {
-          return join12(__dirname, "..", "file.js");
+          return join11(__dirname, "..", "file.js");
         }
         let fixTarget2;
         for (const filePath of callers) {
@@ -8840,7 +8829,7 @@ var require_safe_stable_stringify = __commonJS({
               return circularValue;
             }
             let res = "";
-            let join12 = ",";
+            let join11 = ",";
             const originalIndentation = indentation;
             if (Array.isArray(value)) {
               if (value.length === 0) {
@@ -8854,7 +8843,7 @@ var require_safe_stable_stringify = __commonJS({
                 indentation += spacer;
                 res += `
 ${indentation}`;
-                join12 = `,
+                join11 = `,
 ${indentation}`;
               }
               const maximumValuesToStringify = Math.min(value.length, maximumBreadth);
@@ -8862,13 +8851,13 @@ ${indentation}`;
               for (; i < maximumValuesToStringify - 1; i++) {
                 const tmp2 = stringifyFnReplacer(String(i), value, stack, replacer, spacer, indentation);
                 res += tmp2 !== void 0 ? tmp2 : "null";
-                res += join12;
+                res += join11;
               }
               const tmp = stringifyFnReplacer(String(i), value, stack, replacer, spacer, indentation);
               res += tmp !== void 0 ? tmp : "null";
               if (value.length - 1 > maximumBreadth) {
                 const removedKeys = value.length - maximumBreadth - 1;
-                res += `${join12}"... ${getItemCount(removedKeys)} not stringified"`;
+                res += `${join11}"... ${getItemCount(removedKeys)} not stringified"`;
               }
               if (spacer !== "") {
                 res += `
@@ -8889,7 +8878,7 @@ ${originalIndentation}`;
             let separator = "";
             if (spacer !== "") {
               indentation += spacer;
-              join12 = `,
+              join11 = `,
 ${indentation}`;
               whitespace = " ";
             }
@@ -8903,13 +8892,13 @@ ${indentation}`;
               const tmp = stringifyFnReplacer(key2, value, stack, replacer, spacer, indentation);
               if (tmp !== void 0) {
                 res += `${separator}${strEscape(key2)}:${whitespace}${tmp}`;
-                separator = join12;
+                separator = join11;
               }
             }
             if (keyLength > maximumBreadth) {
               const removedKeys = keyLength - maximumBreadth;
               res += `${separator}"...":${whitespace}"${getItemCount(removedKeys)} not stringified"`;
-              separator = join12;
+              separator = join11;
             }
             if (spacer !== "" && separator.length > 1) {
               res = `
@@ -8950,7 +8939,7 @@ ${originalIndentation}`;
             }
             const originalIndentation = indentation;
             let res = "";
-            let join12 = ",";
+            let join11 = ",";
             if (Array.isArray(value)) {
               if (value.length === 0) {
                 return "[]";
@@ -8963,7 +8952,7 @@ ${originalIndentation}`;
                 indentation += spacer;
                 res += `
 ${indentation}`;
-                join12 = `,
+                join11 = `,
 ${indentation}`;
               }
               const maximumValuesToStringify = Math.min(value.length, maximumBreadth);
@@ -8971,13 +8960,13 @@ ${indentation}`;
               for (; i < maximumValuesToStringify - 1; i++) {
                 const tmp2 = stringifyArrayReplacer(String(i), value[i], stack, replacer, spacer, indentation);
                 res += tmp2 !== void 0 ? tmp2 : "null";
-                res += join12;
+                res += join11;
               }
               const tmp = stringifyArrayReplacer(String(i), value[i], stack, replacer, spacer, indentation);
               res += tmp !== void 0 ? tmp : "null";
               if (value.length - 1 > maximumBreadth) {
                 const removedKeys = value.length - maximumBreadth - 1;
-                res += `${join12}"... ${getItemCount(removedKeys)} not stringified"`;
+                res += `${join11}"... ${getItemCount(removedKeys)} not stringified"`;
               }
               if (spacer !== "") {
                 res += `
@@ -8990,7 +8979,7 @@ ${originalIndentation}`;
             let whitespace = "";
             if (spacer !== "") {
               indentation += spacer;
-              join12 = `,
+              join11 = `,
 ${indentation}`;
               whitespace = " ";
             }
@@ -8999,7 +8988,7 @@ ${indentation}`;
               const tmp = stringifyArrayReplacer(key2, value[key2], stack, replacer, spacer, indentation);
               if (tmp !== void 0) {
                 res += `${separator}${strEscape(key2)}:${whitespace}${tmp}`;
-                separator = join12;
+                separator = join11;
               }
             }
             if (spacer !== "" && separator.length > 1) {
@@ -9057,20 +9046,20 @@ ${originalIndentation}`;
               indentation += spacer;
               let res2 = `
 ${indentation}`;
-              const join13 = `,
+              const join12 = `,
 ${indentation}`;
               const maximumValuesToStringify = Math.min(value.length, maximumBreadth);
               let i = 0;
               for (; i < maximumValuesToStringify - 1; i++) {
                 const tmp2 = stringifyIndent(String(i), value[i], stack, spacer, indentation);
                 res2 += tmp2 !== void 0 ? tmp2 : "null";
-                res2 += join13;
+                res2 += join12;
               }
               const tmp = stringifyIndent(String(i), value[i], stack, spacer, indentation);
               res2 += tmp !== void 0 ? tmp : "null";
               if (value.length - 1 > maximumBreadth) {
                 const removedKeys = value.length - maximumBreadth - 1;
-                res2 += `${join13}"... ${getItemCount(removedKeys)} not stringified"`;
+                res2 += `${join12}"... ${getItemCount(removedKeys)} not stringified"`;
               }
               res2 += `
 ${originalIndentation}`;
@@ -9086,16 +9075,16 @@ ${originalIndentation}`;
               return '"[Object]"';
             }
             indentation += spacer;
-            const join12 = `,
+            const join11 = `,
 ${indentation}`;
             let res = "";
             let separator = "";
             let maximumPropertiesToStringify = Math.min(keyLength, maximumBreadth);
             if (isTypedArrayWithEntries(value)) {
-              res += stringifyTypedArray(value, join12, maximumBreadth);
+              res += stringifyTypedArray(value, join11, maximumBreadth);
               keys = keys.slice(value.length);
               maximumPropertiesToStringify -= value.length;
-              separator = join12;
+              separator = join11;
             }
             if (deterministic) {
               keys = sort(keys, comparator);
@@ -9106,13 +9095,13 @@ ${indentation}`;
               const tmp = stringifyIndent(key2, value[key2], stack, spacer, indentation);
               if (tmp !== void 0) {
                 res += `${separator}${strEscape(key2)}: ${tmp}`;
-                separator = join12;
+                separator = join11;
               }
             }
             if (keyLength > maximumBreadth) {
               const removedKeys = keyLength - maximumBreadth;
               res += `${separator}"...": "${getItemCount(removedKeys)} not stringified"`;
-              separator = join12;
+              separator = join11;
             }
             if (separator !== "") {
               res = `
@@ -10203,11 +10192,11 @@ var init_lib = __esm({
           }
         }
       },
-      addToPath: function addToPath(path39, added, removed, oldPosInc, options) {
-        var last = path39.lastComponent;
+      addToPath: function addToPath(path38, added, removed, oldPosInc, options) {
+        var last = path38.lastComponent;
         if (last && !options.oneChangePerToken && last.added === added && last.removed === removed) {
           return {
-            oldPos: path39.oldPos + oldPosInc,
+            oldPos: path38.oldPos + oldPosInc,
             lastComponent: {
               count: last.count + 1,
               added,
@@ -10217,7 +10206,7 @@ var init_lib = __esm({
           };
         } else {
           return {
-            oldPos: path39.oldPos + oldPosInc,
+            oldPos: path38.oldPos + oldPosInc,
             lastComponent: {
               count: 1,
               added,
@@ -10648,10 +10637,10 @@ function attachmentToHistoryMessage(o, ts) {
     const memories = raw.map((m2) => {
       if (!m2 || typeof m2 !== "object") return null;
       const rec = m2;
-      const path39 = typeof rec.path === "string" ? rec.path : null;
+      const path38 = typeof rec.path === "string" ? rec.path : null;
       const content = typeof rec.content === "string" ? rec.content : null;
-      if (!path39 || content == null) return null;
-      const entry = { path: path39, content };
+      if (!path38 || content == null) return null;
+      const entry = { path: path38, content };
       if (typeof rec.mtimeMs === "number") entry.mtimeMs = rec.mtimeMs;
       return entry;
     }).filter((m2) => m2 !== null);
@@ -11477,10 +11466,10 @@ function parseAttachment(obj) {
     const memories = raw.map((m2) => {
       if (!m2 || typeof m2 !== "object") return null;
       const rec = m2;
-      const path39 = typeof rec.path === "string" ? rec.path : null;
+      const path38 = typeof rec.path === "string" ? rec.path : null;
       const content = typeof rec.content === "string" ? rec.content : null;
-      if (!path39 || content == null) return null;
-      const out = { path: path39, content };
+      if (!path38 || content == null) return null;
+      const out = { path: path38, content };
       if (typeof rec.mtimeMs === "number") out.mtimeMs = rec.mtimeMs;
       return out;
     }).filter((m2) => m2 !== null);
@@ -21045,7 +21034,7 @@ var SessionStoreFactory = class {
   dataDir;
   bareStore = null;
   vmOwnerStores = /* @__PURE__ */ new Map();
-  // vmGuest 索引 key = `${pid}::${capId}`
+  // vmGuest 索引 key = `${pid}::${personId}`（per-People token: 一 person 一目录）
   vmGuestStores = /* @__PURE__ */ new Map();
   constructor(opts) {
     this.dataDir = opts.dataDir;
@@ -21064,7 +21053,7 @@ var SessionStoreFactory = class {
       "owner"
     );
   }
-  vmGuestRoot(personaId, capabilityId) {
+  vmGuestRoot(personaId, personId) {
     return path5.join(
       this.dataDir,
       "personas",
@@ -21072,7 +21061,7 @@ var SessionStoreFactory = class {
       ".clawd",
       "sessions",
       "guests",
-      safeFileName(capabilityId)
+      safeFileName(personId)
     );
   }
   // ---- SessionStore 工厂（缓存） ----
@@ -21090,11 +21079,11 @@ var SessionStoreFactory = class {
     this.vmOwnerStores.set(key, st);
     return st;
   }
-  forVmGuest(personaId, capabilityId) {
-    const key = `${personaId}::${capabilityId}`;
+  forVmGuest(personaId, personId) {
+    const key = `${personaId}::${personId}`;
     const cached = this.vmGuestStores.get(key);
     if (cached) return cached;
-    const st = new SessionStore({ root: this.vmGuestRoot(personaId, capabilityId) });
+    const st = new SessionStore({ root: this.vmGuestRoot(personaId, personId) });
     this.vmGuestStores.set(key, st);
     return st;
   }
@@ -26215,22 +26204,6 @@ var CapabilityRegistry = class {
   findById(id) {
     return this.store.list().find((c) => c.id === id) ?? null;
   }
-  /**
-   * Person identity Phase 1 (B11): guest authenticate 上报 selfPrincipalId 时
-   * daemon 把它落到 cap.linkedPrincipalId（之前 undefined）。设计上 immutable：
-   * 只允许 undefined → set；已设置后再调本方法 noop（reject 留给 caller 判断）。
-   *
-   * 返回 true = 实际写入；false = 不存在 / 已设置过（caller 用此区分用户行为）。
-   */
-  updateLinkedPrincipalId(id, principalId) {
-    const current = this.store.list().find((c) => c.id === id);
-    if (!current) return false;
-    if (current.linkedPrincipalId !== void 0) return false;
-    const updated = { ...current, linkedPrincipalId: principalId };
-    this.bySecretHash.set(updated.secretHash, updated);
-    this.store.upsert(updated);
-    return true;
-  }
 };
 function sha256Hex(s) {
   return crypto4.createHash("sha256").update(s).digest("hex");
@@ -26267,24 +26240,31 @@ var CapabilityManager = class {
       grants: args.grants,
       issuedAt: now,
       usedCount: 0,
+      personId: args.personId,
       ...args.expiresAt !== void 0 ? { expiresAt: args.expiresAt } : {},
       ...args.maxUses !== void 0 ? { maxUses: args.maxUses } : {}
     };
     this.registry.upsertCapability(cap);
-    if (args.atomicAfterPersist) {
-      try {
-        args.atomicAfterPersist(cap);
-      } catch (err) {
-        try {
-          this.registry.delete(cap.id);
-        } catch {
-        }
-        throw err;
-      }
-    }
     this.hooks.onIssued?.(cap, token);
     return { token, capability: cap };
   }
+  /**
+   * Per-People token: 同 personId 已有 cap 时 add grants（merge unique by resource+action）。
+   * 返回 updated cap。如果 personId 没有 cap 返 null（caller 应该调 issue 新建）。
+   */
+  addGrantsToPerson(personId, newGrants) {
+    const existing = this.registry.list().find((c) => c.personId === personId);
+    if (!existing) return null;
+    const merged = mergeGrants(existing.grants, newGrants);
+    const updated = { ...existing, grants: merged };
+    this.registry.upsertCapability(updated);
+    this.hooks.onIssued?.(updated, "__merged__");
+    return updated;
+  }
+  /** 按 personId 反查现有 cap（per-People token dedupe）。 */
+  findByPerson(personId) {
+    return this.registry.list().find((c) => c.personId === personId) ?? null;
+  }
   /**
    * Hard delete：从 registry / store 物理移除 capability。
    * idempotent：不存在 → null（handler 翻译成 VALIDATION_ERROR）
@@ -26296,15 +26276,19 @@ var CapabilityManager = class {
     this.hooks.onDeleted?.(removed);
     return { capability: removed };
   }
-  /**
-   * Person identity Phase 1 (B11) passthrough：guest authenticate 上报
-   * selfPrincipalId 时升级 cap.linkedPrincipalId（一次性，undefined → set）。
-   * 详见 CapabilityRegistry.updateLinkedPrincipalId JSDoc。
-   */
-  updateLinkedPrincipalId(id, principalId) {
-    return this.registry.updateLinkedPrincipalId(id, principalId);
-  }
 };
+function mergeGrants(existing, add) {
+  const key = (g2) => JSON.stringify({ r: g2.resource, a: [...g2.actions].sort() });
+  const seen = new Set(existing.map(key));
+  const out = [...existing];
+  for (const g2 of add) {
+    if (!seen.has(key(g2))) {
+      out.push(g2);
+      seen.add(key(g2));
+    }
+  }
+  return out;
+}
 function defaultGenerateToken() {
   return crypto5.randomBytes(24).toString("base64url");
 }
@@ -26321,7 +26305,7 @@ function cleanupGuestSessionsForCapability(cap, factory) {
   const removed = [];
   for (const g2 of cap.grants) {
     if (g2.resource.type !== "persona") continue;
-    const dir = factory.vmGuestRoot(g2.resource.id, cap.id);
+    const dir = factory.vmGuestRoot(g2.resource.id, cap.personId);
     try {
       fs16.rmSync(dir, { recursive: true, force: true });
       removed.push(dir);
@@ -26718,149 +26702,62 @@ var PersonStore = class {
   }
 };
 
-// src/person/alias-store.ts
+// src/migrations/2026-05-20-flatten-sessions.ts
 var fs20 = __toESM(require("fs"), 1);
 var path22 = __toESM(require("path"), 1);
-var PERSON_ALIASES_SUBDIR = "persons-meta";
-var PERSON_ALIASES_FILE = "aliases.json";
-var PersonAliasStore = class {
-  constructor(dataDir) {
-    this.dataDir = dataDir;
-    fs20.mkdirSync(path22.join(this.dataDir, PERSON_ALIASES_SUBDIR), { recursive: true });
-  }
-  dataDir;
-  get filePath() {
-    return path22.join(this.dataDir, PERSON_ALIASES_SUBDIR, PERSON_ALIASES_FILE);
-  }
-  list() {
-    let raw;
-    try {
-      raw = fs20.readFileSync(this.filePath, "utf8");
-    } catch (err) {
-      if (err?.code === "ENOENT") return [];
-      return [];
-    }
-    let parsed;
-    try {
-      parsed = JSON.parse(raw);
-    } catch {
-      return [];
-    }
-    if (!Array.isArray(parsed)) return [];
-    const out = [];
-    for (const item of parsed) {
-      const r = PersonAliasSchema.safeParse(item);
-      if (r.success) out.push(r.data);
-    }
-    return out;
-  }
-  get(principalId) {
-    return this.list().find((a) => a.principalId === principalId)?.personId;
-  }
-  set(principalId, personId) {
-    const all = this.list().filter((a) => a.principalId !== principalId);
-    all.push({ principalId, personId });
-    this.write(all);
-  }
-  remove(principalId) {
-    const all = this.list();
-    const next = all.filter((a) => a.principalId !== principalId);
-    if (next.length === all.length) return false;
-    this.write(next);
-    return true;
-  }
-  removeAllByPerson(personId) {
-    const all = this.list();
-    const next = all.filter((a) => a.personId !== personId);
-    if (next.length === all.length) return;
-    this.write(next);
-  }
-  /**
-   * 把某条 alias 的 principalId 改为新 key，personId 不变。
-   * 用于 guest 第一次 authenticate 上报 selfPrincipalId 时，把 alias key 从
-   * cap.id（fallback）升级到真实 ownerPrincipalId。
-   *
-   * 若 oldKey 不存在 → no-op。
-   * 若 newKey 已存在另一条 entry → 用 oldKey 的 personId 覆盖（"old wins"），并去重。
-   */
-  rekey(oldPrincipalId, newPrincipalId) {
-    const all = this.list();
-    const old = all.find((a) => a.principalId === oldPrincipalId);
-    if (!old) return;
-    const filtered = all.filter(
-      (a) => a.principalId !== oldPrincipalId && a.principalId !== newPrincipalId
-    );
-    filtered.push({ principalId: newPrincipalId, personId: old.personId });
-    this.write(filtered);
-  }
-  write(entries) {
-    fs20.mkdirSync(path22.join(this.dataDir, PERSON_ALIASES_SUBDIR), { recursive: true });
-    const tmp = `${this.filePath}.tmp-${process.pid}-${Date.now()}-${Math.random().toString(36).slice(2)}`;
-    fs20.writeFileSync(tmp, JSON.stringify(entries, null, 2), { mode: 384 });
-    fs20.renameSync(tmp, this.filePath);
-    try {
-      fs20.chmodSync(this.filePath, 384);
-    } catch {
-    }
-  }
-};
-
-// src/migrations/2026-05-20-flatten-sessions.ts
-var fs21 = __toESM(require("fs"), 1);
-var path23 = __toESM(require("path"), 1);
 var MIGRATION_FLAG_NAME = ".migration.v1.done";
 function migrateFlattenSessions(opts) {
   const dataDir = opts.dataDir;
   const now = opts.now ?? Date.now;
-  const sessionsDir = path23.join(dataDir, "sessions");
-  const flagPath = path23.join(sessionsDir, MIGRATION_FLAG_NAME);
+  const sessionsDir = path22.join(dataDir, "sessions");
+  const flagPath = path22.join(sessionsDir, MIGRATION_FLAG_NAME);
   if (existsSync5(flagPath)) {
     return { skipped: true, flagWritten: false, movedBare: 0, movedVmOwner: 0, archivedListener: 0 };
   }
   let movedBare = 0;
   let movedVmOwner = 0;
   let archivedListener = 0;
-  const defaultDir = path23.join(sessionsDir, "default");
+  const defaultDir = path22.join(sessionsDir, "default");
   if (existsSync5(defaultDir)) {
     for (const entry of readdirSafe(defaultDir)) {
       if (!entry.endsWith(".json")) continue;
-      const src = path23.join(defaultDir, entry);
-      const dst = path23.join(sessionsDir, entry);
-      fs21.renameSync(src, dst);
+      const src = path22.join(defaultDir, entry);
+      const dst = path22.join(sessionsDir, entry);
+      fs20.renameSync(src, dst);
       movedBare += 1;
     }
     rmdirIfEmpty(defaultDir);
   }
   for (const pid of readdirSafe(sessionsDir)) {
-    const personaDir = path23.join(sessionsDir, pid);
+    const personaDir = path22.join(sessionsDir, pid);
     if (!isDir(personaDir)) continue;
     if (pid === "default") continue;
-    const ownerSrc = path23.join(personaDir, "owner");
+    const ownerSrc = path22.join(personaDir, "owner");
     if (existsSync5(ownerSrc) && isDir(ownerSrc)) {
-      const ownerDst = path23.join(dataDir, "personas", pid, ".clawd", "sessions", "owner");
-      fs21.mkdirSync(ownerDst, { recursive: true });
+      const ownerDst = path22.join(dataDir, "personas", pid, ".clawd", "sessions", "owner");
+      fs20.mkdirSync(ownerDst, { recursive: true });
       for (const file of readdirSafe(ownerSrc)) {
         if (!file.endsWith(".json")) continue;
-        fs21.renameSync(path23.join(ownerSrc, file), path23.join(ownerDst, file));
+        fs20.renameSync(path22.join(ownerSrc, file), path22.join(ownerDst, file));
         movedVmOwner += 1;
       }
       rmdirIfEmpty(ownerSrc);
     }
-    const listenerSrc = path23.join(personaDir, "listener");
+    const listenerSrc = path22.join(personaDir, "listener");
     if (existsSync5(listenerSrc) && isDir(listenerSrc)) {
-      const archiveDst = path23.join(dataDir, ".legacy", `listener-${pid}`);
-      fs21.mkdirSync(archiveDst, { recursive: true });
+      const archiveDst = path22.join(dataDir, ".legacy", `listener-${pid}`);
+      fs20.mkdirSync(archiveDst, { recursive: true });
       for (const file of readdirSafe(listenerSrc)) {
         if (!file.endsWith(".json")) continue;
-        fs21.renameSync(path23.join(listenerSrc, file), path23.join(archiveDst, file));
+        fs20.renameSync(path22.join(listenerSrc, file), path22.join(archiveDst, file));
         archivedListener += 1;
       }
       rmdirIfEmpty(listenerSrc);
     }
     rmdirIfEmpty(personaDir);
   }
-  fs21.mkdirSync(sessionsDir, { recursive: true });
-  fs21.writeFileSync(flagPath, JSON.stringify({ migratedAt: now() }, null, 2));
+  fs20.mkdirSync(sessionsDir, { recursive: true });
+  fs20.writeFileSync(flagPath, JSON.stringify({ migratedAt: now() }, null, 2));
   return {
     skipped: false,
     flagWritten: true,
@@ -26871,7 +26768,7 @@ function migrateFlattenSessions(opts) {
 }
 function existsSync5(p2) {
   try {
-    fs21.statSync(p2);
+    fs20.statSync(p2);
     return true;
   } catch {
     return false;
@@ -26879,21 +26776,21 @@ function existsSync5(p2) {
 }
 function isDir(p2) {
   try {
-    return fs21.statSync(p2).isDirectory();
+    return fs20.statSync(p2).isDirectory();
   } catch {
     return false;
   }
 }
 function readdirSafe(p2) {
   try {
-    return fs21.readdirSync(p2);
+    return fs20.readdirSync(p2);
   } catch {
     return [];
   }
 }
 function rmdirIfEmpty(p2) {
   try {
-    fs21.rmdirSync(p2);
+    fs20.rmdirSync(p2);
   } catch {
   }
 }
@@ -28239,7 +28136,15 @@ function buildSessionHandlers(deps) {
       }
     }
     ensurePersonaAccess(ctx, args.ownerPersonaId, "send");
-    const creatorPrincipalId = ctx?.principal.id ?? "";
+    let creatorPrincipalId = "";
+    if (ctx) {
+      if (ctx.principal.kind === "guest" && ctx.capabilityId && deps.capabilityManager) {
+        const cap = deps.capabilityManager.findById(ctx.capabilityId);
+        creatorPrincipalId = cap?.personId ?? ctx.principal.id;
+      } else {
+        creatorPrincipalId = ctx.principal.id;
+      }
+    }
     const { response, broadcast } = manager.create(args, creatorPrincipalId);
     return { response: { type: "session:info", ...response }, broadcast };
   };
@@ -28693,7 +28598,7 @@ var DeleteArgsSchema = external_exports.object({
   capabilityId: external_exports.string().min(1)
 }).strict();
 function buildCapabilityHandlers(deps) {
-  const { manager, getShareBaseUrl, personStore, aliasStore } = deps;
+  const { manager, getShareBaseUrl, personStore } = deps;
   const issue = async (frame) => {
     const { type: _type, requestId: _requestId, ...rest } = frame;
     const args = CapabilityIssueArgsSchema.parse(rest);
@@ -28703,12 +28608,25 @@ function buildCapabilityHandlers(deps) {
         `Person not found: ${args.personId}`
       );
     }
+    const existing = manager.findByPerson(args.personId);
+    if (existing) {
+      const updated = manager.addGrantsToPerson(args.personId, args.grants);
+      if (!updated) {
+        throw new ClawdError(ERROR_CODES.INTERNAL, "addGrantsToPerson returned null");
+      }
+      return {
+        response: {
+          type: "capability:issued",
+          token: "__merged__",
+          shareUrl: "",
+          capability: stripSecretHash(updated)
+        }
+      };
+    }
     const { personId, ...managerArgs } = args;
     const { token, capability } = manager.issue({
       ...managerArgs,
-      atomicAfterPersist: (cap) => {
-        aliasStore.set(cap.id, personId);
-      }
+      personId
     });
     const base = getShareBaseUrl().replace(/\/$/, "");
     const shareUrl = `${base}/?token=${encodeURIComponent(token)}`;
@@ -28739,10 +28657,6 @@ function buildCapabilityHandlers(deps) {
         `capability not found: ${args.capabilityId}`
       );
     }
-    aliasStore.remove(args.capabilityId);
-    if (result.capability.linkedPrincipalId !== void 0) {
-      aliasStore.remove(result.capability.linkedPrincipalId);
-    }
     return {
       response: {
         type: "capability:deleted",
@@ -28768,7 +28682,7 @@ function assertChannelAccess(ctx, capabilityId) {
   );
 }
 function buildInboxHandlers(deps) {
-  const { manager, personStore, aliasStore } = deps;
+  const { manager, personStore, capabilityManager } = deps;
   const postMessage = async (frame, _client, ctx) => {
     const { type: _t, requestId: _r, ...rest } = frame;
     const args = InboxPostMessageArgsSchema.parse(rest);
@@ -28776,11 +28690,10 @@ function buildInboxHandlers(deps) {
       throw new ClawdError(ERROR_CODES.INTERNAL, "inbox:postMessage: missing ConnectionContext");
     }
     assertChannelAccess(ctx, args.capabilityId);
-    if (ctx.principal.kind === "guest") {
-      const senderPrincipalId = ctx.principal.id;
-      const personId = aliasStore.get(senderPrincipalId);
-      if (personId !== void 0) {
-        const person = personStore.get(personId);
+    if (ctx.principal.kind === "guest" && ctx.capabilityId) {
+      const cap = capabilityManager.findById(ctx.capabilityId);
+      if (cap) {
+        const person = personStore.get(cap.personId);
         if (person && !person.dmEnabled) {
           throw new ClawdError(
             ERROR_CODES.VALIDATION_ERROR,
@@ -28841,7 +28754,7 @@ function buildInboxHandlers(deps) {
 // src/handlers/remote-persona.ts
 init_protocol();
 function buildRemotePersonaHandlers(deps) {
-  const { store, personStore, aliasStore } = deps;
+  const { store, personStore } = deps;
   const now = deps.now ?? Date.now;
   const add = async (frame) => {
     const { type: _t, requestId: _r, ...rest } = frame;
@@ -28852,9 +28765,8 @@ function buildRemotePersonaHandlers(deps) {
         `Person not found: ${args.personId}`
       );
     }
-    const { personId, ...persistFields } = args;
     const rp = {
-      ...persistFields,
+      ...args,
       addedAt: now()
     };
     try {
@@ -28868,15 +28780,6 @@ function buildRemotePersonaHandlers(deps) {
       }
       throw err;
     }
-    try {
-      aliasStore.set(rp.ownerPrincipalId, personId);
-    } catch (err) {
-      try {
-        store.remove(rp.alias);
-      } catch {
-      }
-      throw err;
-    }
     return {
       response: { type: "remote-persona:add:ok", remotePersona: stripRemotePersonaSecret(rp) }
     };
@@ -28894,11 +28797,7 @@ function buildRemotePersonaHandlers(deps) {
   const remove = async (frame) => {
     const { type: _t, requestId: _r, ...rest } = frame;
     const args = RemotePersonaRemoveArgsSchema.parse(rest);
-    const existing = store.get(args.alias);
     const removed = store.remove(args.alias);
-    if (existing) {
-      aliasStore.remove(existing.ownerPrincipalId);
-    }
     return {
       response: { type: "remote-persona:remove:ok", alias: args.alias, removed }
     };
@@ -28925,7 +28824,9 @@ function buildWhoamiHandler(deps) {
         displayName: deps.ownerDisplayName,
         grants: ctx.grants,
         issuedAt: 0,
-        usedCount: 0
+        usedCount: 0,
+        // owner self cap 没有真实 Person 主人；用 ownerPrincipalId 自指，UI 不会反查这条
+        personId: deps.ownerPrincipalId
       };
     } else {
       if (!ctx.capabilityId) {
@@ -29088,12 +28989,8 @@ var EMPTY_RESULT = {
 };
 function cascadeDeletePerson(personId, deps) {
   if (!deps.personStore.get(personId)) return { ...EMPTY_RESULT };
-  const principalIds = deps.aliasStore.list().filter((a) => a.personId === personId).map((a) => a.principalId);
-  const principalSet = new Set(principalIds);
   const allCaps = deps.capabilityManager.list();
-  const capsToDelete = allCaps.filter(
-    (c) => principalSet.has(c.id) || c.linkedPrincipalId !== void 0 && principalSet.has(c.linkedPrincipalId)
-  );
+  const capsToDelete = allCaps.filter((c) => c.personId === personId);
   let deletedInboxEvents = 0;
   for (const c of capsToDelete) {
     deletedInboxEvents += deps.inboxStore.list(c.id).length;
@@ -29105,14 +29002,13 @@ function cascadeDeletePerson(personId, deps) {
     }
   }
   const allRemotes = deps.remotePersonaStore.list();
-  const remotesToRemove = allRemotes.filter((r) => principalSet.has(r.ownerPrincipalId));
+  const remotesToRemove = allRemotes.filter((r) => r.personId === personId);
   const removedRemoteAliases = [];
   for (const r of remotesToRemove) {
     if (deps.remotePersonaStore.remove(r.alias)) {
       removedRemoteAliases.push(r.alias);
     }
   }
-  deps.aliasStore.removeAllByPerson(personId);
   deps.personStore.remove(personId);
   return { deletedCapabilityIds, removedRemoteAliases, deletedInboxEvents };
 }
@@ -29123,22 +29019,13 @@ function buildPersonHandlers(deps) {
   const genId = deps.genId ?? defaultGenId2;
   const list = async () => {
     const persons = deps.personStore.list();
-    const aliases = deps.aliasStore.list();
-    const personIdByPrincipal = new Map(aliases.map((a) => [a.principalId, a.personId]));
     const allCaps = deps.capabilityManager.list();
     const allRemotes = deps.remotePersonaStore.list();
-    const out = persons.map((p2) => {
-      const linkedCapabilityIds = [];
-      for (const c of allCaps) {
-        const key = c.linkedPrincipalId ?? c.id;
-        if (personIdByPrincipal.get(key) === p2.id) linkedCapabilityIds.push(c.id);
-      }
-      const linkedRemoteAliases = [];
-      for (const r of allRemotes) {
-        if (personIdByPrincipal.get(r.ownerPrincipalId) === p2.id) linkedRemoteAliases.push(r.alias);
-      }
-      return { ...p2, linkedCapabilityIds, linkedRemoteAliases };
-    });
+    const out = persons.map((p2) => ({
+      ...p2,
+      linkedCapabilityIds: allCaps.filter((c) => c.personId === p2.id).map((c) => c.id),
+      linkedRemoteAliases: allRemotes.filter((r) => r.personId === p2.id).map((r) => r.alias)
+    }));
     return { response: { type: "person:list:ok", persons: out } };
   };
   const create = async (frame) => {
@@ -29192,21 +29079,11 @@ function buildPersonHandlers(deps) {
       }
     };
   };
-  const link = async (frame) => {
-    const { type: _t, requestId: _r, ...rest } = frame;
-    const args = PersonLinkArgsSchema.parse(rest);
-    if (!deps.personStore.get(args.personId)) {
-      throw new ClawdError(ERROR_CODES.VALIDATION_ERROR, `Person not found: ${args.personId}`);
-    }
-    deps.aliasStore.set(args.principalId, args.personId);
-    return { response: { type: "person:link:ok" } };
-  };
   return {
     "person:list": list,
     "person:create": create,
     "person:update": update,
-    "person:delete": del,
-    "person:link": link
+    "person:delete": del
   };
 }
 function defaultGenId2() {
@@ -29331,27 +29208,21 @@ function buildMethodHandlers(deps) {
     ...buildCapabilityHandlers({
       manager: deps.capabilityManager,
       getShareBaseUrl: deps.getShareBaseUrl,
-      personStore: deps.personStore,
-      aliasStore: deps.personAliasStore
+      personStore: deps.personStore
     }),
     ...buildInboxHandlers({
       manager: deps.inboxManager,
       personStore: deps.personStore,
-      aliasStore: deps.personAliasStore
+      capabilityManager: deps.capabilityManager
     }),
     ...buildRemotePersonaHandlers({
       store: deps.remotePersonaStore,
-      personStore: deps.personStore,
-      aliasStore: deps.personAliasStore
+      personStore: deps.personStore
     }),
     ...buildPersonHandlers({
       personStore: deps.personStore,
-      aliasStore: deps.personAliasStore,
       capabilityManager: deps.capabilityManager,
       remotePersonaStore: deps.remotePersonaStore,
-      // inbox channel cascade: person:delete 时用 inboxStore.list 统计每个 cap channel
-      // 消息数 sum 起来作为 deletedInboxEvents 返回 (实际删除走 capability:delete
-      // onDeleted hook → inboxManager.removeChannel, cascade 不主动 rm 文件).
       inboxStore: deps.inboxStore
     }),
     whoami: buildWhoamiHandler({
@@ -29398,7 +29269,6 @@ var METHOD_GRANT_MAP = {
   "person:create": ADMIN_ANY,
   "person:update": ADMIN_ANY,
   "person:delete": ADMIN_ANY,
-  "person:link": ADMIN_ANY,
   // ---- session:* / chat:* 业务方法（v2 Phase 8 两层模型）----
   // dispatcher 不验资源，handler 内按 ctx + frame.args 反查 ownerPersonaId 调 assertGrant。
   // owner 自动通过（ctx 自带 '*':'admin' grant 一切 match）；guest 在被授权 persona 内可调。
@@ -29526,43 +29396,19 @@ async function startDaemon(config) {
   });
   const remotePersonaStore = new RemotePersonaStore(config.dataDir);
   const personStore = new PersonStore(config.dataDir);
-  const personAliasStore = new PersonAliasStore(config.dataDir);
   let wsServer = null;
   const authGate = authMode === "first-message" ? new AuthGate({
     shouldEnforce: buildShouldEnforce({ tunnel: config.tunnel }),
     // Task 1.7：authenticate 注入路径替代 expectedToken 单 token 比对。
     // owner 路径 constantTimeEqual 防侧信道；guest 路径走 capabilityRegistry.
     expectedToken: resolvedAuthToken,
-    authenticate: (t, selfPrincipalId) => {
-      const r = authenticate(t, {
+    authenticate: (t, _selfPrincipalId) => {
+      return authenticate(t, {
         isOwnerToken: (x) => resolvedAuthToken != null && constantTimeEqual(x, resolvedAuthToken),
         ownerPrincipalId,
         ownerDisplayName,
         capabilityRegistry
       });
-      if (r.ok && selfPrincipalId && r.context.principal.kind === "guest" && r.context.capabilityId) {
-        const capId = r.context.capabilityId;
-        const cap = capabilityManager.findById(capId);
-        if (cap && cap.linkedPrincipalId === void 0) {
-          capabilityManager.updateLinkedPrincipalId(capId, selfPrincipalId);
-          try {
-            personAliasStore.rekey(capId, selfPrincipalId);
-          } catch (e) {
-            logger.warn("auth.alias.rekey.failed", {
-              capId,
-              selfPrincipalId,
-              err: e.message
-            });
-          }
-        } else if (cap && cap.linkedPrincipalId !== selfPrincipalId) {
-          logger.warn("auth.selfPrincipalId.mismatch", {
-            capId,
-            expected: cap.linkedPrincipalId,
-            got: selfPrincipalId
-          });
-        }
-      }
-      return r;
     },
     onAuthed: (h, ctx) => wsServer?.attachClientContext(h.id, ctx),
     buildOwnerContext: () => ownerContext(ownerPrincipalId, ownerDisplayName),
@@ -29759,10 +29605,9 @@ async function startDaemon(config) {
     inboxStore,
     // Phase 4 Task 4.3: remote-persona:* handler 依赖 (本地存储, v1 不接 outgoing WS)
     remotePersonaStore,
-    // Person identity Phase 1 (B13): person:* RPC handlers + 给 capability:issue /
-    // remote-persona:add atomic 写 alias / cascade 删 Person 用
-    personStore,
-    personAliasStore
+    // Per-People token (2026-05-21): person:* RPC handlers + cap/remote 自带
+    // personId 字段（PersonAlias 表已删）
+    personStore
   });
   const authResolver = new AuthContextResolver({
     ownerToken: resolvedAuthToken