@ycodium-ai/plugin-team 0.2.3576 → 0.2.3608

package/dist/index.js

@@ -7268,6 +7268,7 @@ async function createGoalThread(ctx, goal, thread) {
     requestId: `thread:${thread.threadId}`,
     threadId: thread.threadId,
     projectId: goal.projectId,
+    memberId: thread.memberId,
     title: goalThreadTitle(goal, thread.name),
     ...thread.selection,
     // 有意写死、不读默认档：带团队的 AI 要无人值守地干活，成员子会话按 YCO-337 只能与负责人同档或更严。
@@ -7290,6 +7291,7 @@ async function createTeamThread(ctx, thread) {
     requestId: `thread:${thread.threadId}`,
     threadId: thread.threadId,
     projectId: thread.projectId,
+    memberId: thread.memberId,
     title: thread.title,
     ...thread.selection,
     runtimeMode: "full-access",
@@ -7411,6 +7413,16 @@ function registerGoalCommands(ctx, service2) {
 // src/watch.ts
 import * as NodeTimers from "node:timers";
 
+// src/domain/person.ts
+var personKey = (person) => person.kind === "account" ? `account:${person.userId}` : `local-owner:${person.environmentId}`;
+var samePerson = (a, b) => personKey(a) === personKey(b);
+var personOfMember = (member) => member.identity?.kind === "human" && member.identity.principal !== void 0 ? member.identity.principal : null;
+var currentPerson = async (invocation) => invocation.viewer === void 0 ? null : (await invocation.viewer.communication.people.current({})).person;
+async function personDisplayName(ctx, projectId, person, fallback) {
+  const { items } = await ctx.communication.people.list({ projectId, limit: 100 });
+  return items.find((item) => samePerson(item.person, person))?.displayName ?? fallback;
+}
+
 // src/domain/roster.ts
 var MEMBER_ID_PATTERN = /^[A-Za-z0-9_-]{1,64}$/;
 var MAX_NAME_LENGTH = 40;
@@ -7535,7 +7547,6 @@ var WorkIdentity = Struct({
   /** 人的稳定键（见 personKey），界面拿它到快照的人名表里找名字。 */
   personKey: optionalKey2(String4)
 });
-var personKey = (principal) => principal.kind === "account" ? `account:${principal.userId}` : `local-owner:${principal.environmentId}`;
 var workIdentity = (value) => ({
   kind: value.kind,
   ...value.principalId === void 0 ? {} : { principalId: value.principalId },
@@ -9045,6 +9056,67 @@ function createRosterService(ctx, options = {}) {
 
 // src/runtime/deliver.ts
 import * as NodeCrypto from "node:crypto";
+
+// ../../packages/ycodium-system-text/src/systemText.ts
+var SYSTEM_NOTIFICATION_OPEN_TAG = "<ycodium-system>";
+var SYSTEM_NOTIFICATION_CLOSE_TAG = "</ycodium-system>";
+var isSystemNotificationText = (text) => text.startsWith(SYSTEM_NOTIFICATION_OPEN_TAG);
+var rendersAsSystemMessage = (text) => isSystemNotificationText(text) && !(isPresetPrefixMessage(text) && text.includes(PRESET_PREFIX_CLOSE) && parsePresetPrefixText(text) === null);
+var FIRST_BLOCK_START = `^(?:${SYSTEM_NOTIFICATION_OPEN_TAG}\\n)?`;
+var PRESET_PREFIX_MESSAGE_START = `${SYSTEM_NOTIFICATION_OPEN_TAG}
+<preset-prefix `;
+var isPresetPrefixMessage = (text) => text.startsWith(PRESET_PREFIX_MESSAGE_START);
+var SYSTEM_TEXT_ESCAPED_ATTRIBUTE = 'esc="1"';
+var escapeSystemText = (text) => text.replace(/&/g, "&amp;").replace(/</g, "&lt;");
+var SYSTEM_TEXT_MAX_ESCAPE_GROWTH = "&amp;".length;
+var escapeSystemAttribute = (text) => escapeSystemText(text).replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/\r/g, "&#13;").replace(/\n/g, "&#10;");
+var ESCAPED_BLOCK_NAMES = [
+  "thread-response",
+  "thread-handover",
+  "scheduled-wake",
+  "plugin-wake"
+];
+var escapedBlockOpenTag = (name, attributes) => `<${name} ${[
+  ...attributes.map(([key, value]) => `${key}="${escapeSystemAttribute(value)}"`),
+  SYSTEM_TEXT_ESCAPED_ATTRIBUTE
+].join(" ")}>`;
+var ESCAPED_OPEN_LINE_PATTERN = new RegExp(
+  `^<(?:${ESCAPED_BLOCK_NAMES.join("|")})(?:\\s[^>]*)? ${SYSTEM_TEXT_ESCAPED_ATTRIBUTE}>$`
+);
+var PRESET_PREFIX_CLOSE = `
+</preset-prefix>
+${SYSTEM_NOTIFICATION_CLOSE_TAG}`;
+var PRESET_PREFIX_PATTERN = new RegExp(
+  `^${SYSTEM_NOTIFICATION_OPEN_TAG}\\n<preset-prefix id="([^"]*)">\\n([\\s\\S]*?)\\n</preset-prefix>\\n${SYSTEM_NOTIFICATION_CLOSE_TAG}(?:\\n\\n([\\s\\S]*))?$`
+);
+var parsePresetPrefixText = (text) => {
+  if (text.split(PRESET_PREFIX_CLOSE).length !== 2) return null;
+  const match7 = PRESET_PREFIX_PATTERN.exec(text);
+  if (match7 === null) return null;
+  const [, presetId, prefix, body] = match7;
+  if (!presetId) return null;
+  return { presetId, prefix: prefix ?? "", body: body ?? "" };
+};
+var userSpokenText = (text) => {
+  if (!rendersAsSystemMessage(text)) return text;
+  return parsePresetPrefixText(text)?.body || null;
+};
+var formatPluginWakeText = (input) => [
+  SYSTEM_NOTIFICATION_OPEN_TAG,
+  escapedBlockOpenTag("plugin-wake", [
+    ["plugin", input.pluginId],
+    ["reason", input.reason],
+    ...input.item ? [["item", input.item]] : []
+  ]),
+  escapeSystemText(input.text),
+  "</plugin-wake>",
+  SYSTEM_NOTIFICATION_CLOSE_TAG
+].join("\n");
+var PLUGIN_WAKE_PATTERN = new RegExp(
+  `${FIRST_BLOCK_START}<plugin-wake plugin="([^"]+)" reason="([^"]+)"(?: item="([^"]+)")? ${SYSTEM_TEXT_ESCAPED_ATTRIBUTE}>\\n[\\s\\S]*?\\n</plugin-wake>`
+);
+
+// src/runtime/deliver.ts
 var worktreeSetupSentence = async (ctx, projectId, branch) => {
   const intro = `You are in your own newly created worktree on branch ${branch}.`;
   const project2 = await ctx.projects.get({ projectId }).catch(() => null);
@@ -9053,6 +9125,12 @@ var worktreeSetupSentence = async (ctx, projectId, branch) => {
     return `${intro} Install dependencies according to the project's instructions before starting work.`;
   return `${intro} If dependencies are missing, install them before starting work. This project defines a setup command for that: ${setup.command}; run it from the worktree root with the environment variables YCODIUM_PROJECT_ROOT set to "${project2.workspaceRoot}" and YCODIUM_WORKTREE_PATH set to this worktree's path. If it fails with "could not lock config file", wait a moment and run it again.`;
 };
+var teamWakeText = (display, text) => formatPluginWakeText({
+  pluginId: "team",
+  reason: display.reason,
+  item: display.sequenceId === void 0 ? void 0 : `W${display.sequenceId}`,
+  text
+});
 var stableHash = (key) => NodeCrypto.createHash("sha256").update(key).digest("hex").slice(0, 32);
 var memberWorktreeBranch = (name, threadId) => {
   const slug = Array.from(
@@ -9104,7 +9182,7 @@ async function deliverWake(ctx, input) {
       message: {
         messageId: input.messageId,
         role: "user",
-        text,
+        text: teamWakeText(input.wake, text),
         attachments: []
       },
       modelSelection: execution.modelSelection,
@@ -9141,9 +9219,12 @@ async function deliverWake(ctx, input) {
             requestId: input.requestId,
             message: {
               ...turn.message,
-              text: `${text}
+              text: teamWakeText(
+                input.wake,
+                `${text}
 
 ${await worktreeSetupSentence(ctx, input.projectId, branch)}`
+              )
             },
             bootstrap: {
               prepareWorktree: {
@@ -9179,7 +9260,8 @@ ${await worktreeSetupSentence(ctx, input.projectId, branch)}`
         recipient: { threadId: worktree.leadThreadId },
         requestId: `team-worktree-report:${threadId}`,
         messageId: `team-worktree-report-msg:${threadId}`,
-        text: `Could not create a worktree for member ${await worktree.name()} (threadId ${threadId}): ${failure.reason}. They will work in the project folder for now.`
+        text: `Could not create a worktree for member ${await worktree.name()} (threadId ${threadId}): ${failure.reason}. They will work in the project folder for now.`,
+        wake: { reason: "notice" }
       });
       if (!reported) throw new Error("Member worktree failure could not be reported to the lead");
       const receipt = await worktree.lane.events.append({
@@ -9487,6 +9569,10 @@ var en_default = {
     kindAgentHint: "Runs with the provider and model you pick when the machine is this one. A member set to another machine fails its trial run: set it back to this machine, or skip the trial run, and it runs on this machine with the project's default model.",
     kindRemoteHint: "An agent that connects from another machine with its own credentials.",
     kindPersonHint: "A teammate. People are listed as members but do not run sessions.",
+    thisIsMe: "This is me",
+    thisIsMeHint: "When someone @-mentions this member in a team group, the message goes to your Sent to me.",
+    boundToOther: "This member is another person. Only they can change this.",
+    you: "You",
     name: "Name",
     memberTitle: "Title",
     responsibility: "Responsibility",
@@ -9533,6 +9619,7 @@ var en_default = {
       noDefaultModel: "This project has no default model. Choose one in the project settings under New threads \u2192 Model, then try again.",
       modelUnavailable: "The project's default model isn't available on this machine. Check the provider, or choose another model in the project settings under New threads \u2192 Model.",
       duplicateMember: "Another member already has this name or remote agent. Rename or remove that member first.",
+      alreadyYou: "You are already {{name}} on this roster. Clear \u201CThis is me\u201D on {{name}} first.",
       staleVersion: "This member was changed elsewhere and has been reloaded. Review it and save again.",
       notFound: "This member no longer exists.",
       invalidState: "The member's state was changed elsewhere and has been reloaded.",
@@ -10035,7 +10122,10 @@ function createGoalService(ctx, rosterService, options = {}) {
       message: {
         messageId: `team-lead-message:${goal.projectId}:${goal.goalId}`,
         role: "user",
-        text: leadBrief(goal, roster, { engineMembers: view.stored?.version === 2 }),
+        text: teamWakeText(
+          { reason: "instructions" },
+          leadBrief(goal, roster, { engineMembers: view.stored?.version === 2 })
+        ),
         attachments: []
       },
       modelSelection: selections.get(goal.leadMemberId).modelSelection,
@@ -10090,6 +10180,7 @@ import {
   MEMBER_RESPONSIBILITY_MAX,
   MEMBER_TITLE_MAX
 } from "@ycodium-ai/plugin-api";
+var MAX_MEMBER_NAME_LENGTH = MEMBER_NAME_MAX;
 var MemberAvatar = Struct({ pattern: String4, color: String4 });
 var AgentChoice = Struct({
   environmentId: String4,
@@ -10104,6 +10195,8 @@ var MemberRow = Struct({
   avatar: NullOr(MemberAvatar),
   /** 远端 agent 成员绑的主体；本机 agent 与人是 null。 */
   remotePrincipalId: NullOr(String4),
+  /** 人成员绑着的人是不是正在看这一页的人；没绑就没有这一项。 */
+  person: optionalKey2(Literals(["me", "other"])),
   agent: NullOr(
     Struct({
       environmentId: String4,
@@ -10158,7 +10251,9 @@ var CreateMemberInput = Struct({
   avatar: optionalKey2(MemberAvatar),
   /** 给了就是远端 agent：绑这个主体。 */
   remotePrincipalId: optionalKey2(String4),
-  agent: optionalKey2(AgentChoice)
+  agent: optionalKey2(AgentChoice),
+  /** 人成员「这是我」：绑到发起这次调用的人。 */
+  bindToMe: optionalKey2(Boolean3)
 });
 var UpdateMemberInput = Struct({
   ...projectAndRequest,
@@ -10168,7 +10263,9 @@ var UpdateMemberInput = Struct({
   ...memberTextFields,
   avatar: optionalKey2(MemberAvatar),
   clearAvatar: optionalKey2(Boolean3),
-  agent: optionalKey2(AgentChoice)
+  agent: optionalKey2(AgentChoice),
+  /** 人成员「这是我」：`true` 绑到发起这次调用的人，`false` 解绑。 */
+  bindToMe: optionalKey2(Boolean3)
 });
 var MemberRefInput = Struct({ ...projectAndRequest, memberId: String4 });
 var ImportRosterInput = Struct({ projectId: String4 });
@@ -10646,24 +10743,30 @@ function startCoordinatorRuntime(ctx, deps) {
 }
 
 // src/members/snapshot.ts
-var toMemberRow = (member, trial) => ({
-  memberId: member.memberId,
-  kind: member.kind,
-  name: member.name,
-  title: member.title,
-  responsibility: member.responsibility,
-  avatar: member.avatar === null ? null : { pattern: member.avatar.pattern, color: member.avatar.color },
-  remotePrincipalId: member.identity?.kind === "remote-agent" ? member.identity.principalId : null,
-  agent: member.agent === null ? null : {
-    environmentId: member.agent.environmentId,
-    instanceId: member.agent.modelSelection.instanceId,
-    model: member.agent.modelSelection.model
-  },
-  hasInstructions: member.workInstructionsRevision !== null,
-  version: member.version,
-  removed: member.removedAt !== null,
-  ...trial === null ? {} : { trial }
-});
+var toMemberRow = (member, trial, viewer) => {
+  const person = personOfMember(member);
+  return {
+    memberId: member.memberId,
+    kind: member.kind,
+    name: member.name,
+    title: member.title,
+    responsibility: member.responsibility,
+    avatar: member.avatar === null ? null : { pattern: member.avatar.pattern, color: member.avatar.color },
+    remotePrincipalId: member.identity?.kind === "remote-agent" ? member.identity.principalId : null,
+    ...person === null ? {} : {
+      person: viewer !== null && samePerson(person, viewer) ? "me" : "other"
+    },
+    agent: member.agent === null ? null : {
+      environmentId: member.agent.environmentId,
+      instanceId: member.agent.modelSelection.instanceId,
+      model: member.agent.modelSelection.model
+    },
+    hasInstructions: member.workInstructionsRevision !== null,
+    version: member.version,
+    removed: member.removedAt !== null,
+    ...trial === null ? {} : { trial }
+  };
+};
 var legacyOffer = (stored) => ({
   revision: stored.roster.revision,
   leadMemberId: stored.roster.leadMemberId,
@@ -10673,10 +10776,10 @@ var legacyOffer = (stored) => ({
     principalId: member.principal?.principalId ?? null
   }))
 });
-function membersSnapshot(view, trialOf = () => null) {
+function membersSnapshot(view, trialOf = () => null, viewer = null) {
   const { stored } = view;
   return {
-    members: view.members.map((member) => toMemberRow(member, trialOf(member.memberId))),
+    members: view.members.map((member) => toMemberRow(member, trialOf(member.memberId), viewer)),
     lead: {
       memberId: stored?.version === 2 ? stored.roster.leadMemberId : null,
       revision: stored?.roster.revision ?? 0
@@ -10999,10 +11102,18 @@ function registerMemberCommands(ctx, rosters, writer, trials2) {
     name: "members",
     scope: "read",
     payloadSchema: payloadSchemaOf(ReadMembersInput),
-    handle: async (payload) => {
+    handle: async (payload, invocation) => {
       const { projectId } = decodeReadMembers(payload);
-      const [view, trial] = await Promise.all([rosters.inspect(projectId), trials2.get()]);
-      return membersSnapshot(view, (memberId) => trialViewOf(recordOf(trial, projectId, memberId)));
+      const [view, trial, viewer] = await Promise.all([
+        rosters.inspect(projectId),
+        trials2.get(),
+        currentPerson(invocation)
+      ]);
+      return membersSnapshot(
+        view,
+        (memberId) => trialViewOf(recordOf(trial, projectId, memberId)),
+        viewer
+      );
     }
   });
   ctx.command({
@@ -11091,14 +11202,21 @@ function createMemberWriter(ctx, rosters, queue = createSerial()) {
   const serial = queue.run;
   const asPerson = (commandType, handler) => (payload, invocation) => serial(async () => {
     const person = invocation.asPerson;
-    return person === void 0 ? rejectMember(commandType, "needs-person") : handler(payload, person.members);
+    return person === void 0 ? rejectMember(commandType, "needs-person") : handler(payload, person.members, invocation);
   });
-  const create = asPerson("createMember", async (payload, members) => {
+  const meOf = async (commandType, invocation) => await currentPerson(invocation) ?? rejectMember(commandType, "needs-person");
+  const create = asPerson("createMember", async (payload, members, invocation) => {
     const decoded = decodeCreate3(payload);
     if (isNone2(decoded)) return rejectMember("createMember", "invalid-payload");
     const input = decoded.value;
-    if (input.kind === "human" && (input.agent !== void 0 || input.remotePrincipalId !== void 0))
+    if (input.kind === "human" ? input.agent !== void 0 || input.remotePrincipalId !== void 0 : input.bindToMe !== void 0)
       return rejectMember("createMember", "invalid-payload");
+    let me;
+    if (input.bindToMe === true) {
+      const found = await meOf("createMember", invocation);
+      if ("code" in found) return found;
+      me = found;
+    }
     const memberId = createdMemberId(input.projectId, input.requestId);
     let agent;
     if (input.kind === "agent") {
@@ -11125,17 +11243,29 @@ function createMemberWriter(ctx, rosters, queue = createSerial()) {
         ...input.avatar === void 0 ? {} : { avatar: input.avatar },
         ...input.workInstructions === void 0 ? {} : { workInstructions: input.workInstructions },
         ...input.remotePrincipalId === void 0 ? {} : { identity: { kind: "remote-agent", principalId: input.remotePrincipalId } },
+        ...me === void 0 ? {} : { identity: { kind: "human", principal: me } },
         ...agent === void 0 ? {} : { agent }
       })
     );
     return "code" in result2 ? result2 : written(result2);
   });
-  const update = asPerson("updateMember", async (payload, members) => {
+  const update = asPerson("updateMember", async (payload, members, invocation) => {
     const decoded = decodeUpdate3(payload);
     if (isNone2(decoded)) return rejectMember("updateMember", "invalid-payload");
     const input = decoded.value;
     if (input.avatar !== void 0 && input.clearAvatar === true)
       return rejectMember("updateMember", "invalid-payload");
+    let identity2;
+    if (input.bindToMe !== void 0) {
+      const me = await meOf("updateMember", invocation);
+      if ("code" in me) return me;
+      const member = await findMember(ctx, input.projectId, input.memberId);
+      if (member === null) return rejectMember("updateMember", "not-found");
+      const held = personOfMember(member);
+      if (held !== null && !samePerson(held, me))
+        return rejectMember("updateMember", "bound-to-other");
+      identity2 = input.bindToMe ? { kind: "human", principal: me } : null;
+    }
     const result2 = await refused(
       "updateMember",
       () => members.update({
@@ -11148,7 +11278,8 @@ function createMemberWriter(ctx, rosters, queue = createSerial()) {
         ...input.responsibility === void 0 ? {} : { responsibility: input.responsibility },
         ...input.clearAvatar === true ? { avatar: null } : input.avatar === void 0 ? {} : { avatar: input.avatar },
         ...input.workInstructions === void 0 ? {} : { workInstructions: input.workInstructions },
-        ...input.agent === void 0 ? {} : { agent: toEngineAgent(input.agent) }
+        ...input.agent === void 0 ? {} : { agent: toEngineAgent(input.agent) },
+        ...identity2 === void 0 ? {} : { identity: identity2 }
       })
     );
     return "code" in result2 ? result2 : written(result2);
@@ -11694,7 +11825,15 @@ function startGroupDeliveryRuntime(ctx, wakes, now3 = () => runPromise2(map5(now
   };
   ctx.reactor({
     name: "team-group-delivery",
-    events: ["communication.group-message-sent", "work.line-restored", "plugin.event-appended"],
+    // 成员建出或改了（人点「这是我」绑上）也补扫：停在待绑定的人目标立刻投到人。
+    events: [
+      "communication.group-message-sent",
+      "work.line-restored",
+      "plugin.event-appended",
+      "member.created",
+      "member.updated",
+      "member.restored"
+    ],
     handle: (event) => {
       const projectId = decodeProjectEvent(event.payload);
       if (isSome2(projectId)) return sweep(projectId.value.projectId);
@@ -11792,6 +11931,7 @@ function startMemberBindingRuntime(ctx, goals, rosters, wakes, trials2) {
       if (goal.workLineId !== void 0 && lead !== void 0)
         await createTeamThread(ctx, {
           projectId,
+          memberId: member.memberId,
           threadId,
           parentThreadId: lead.threadId,
           title: goalThreadTitle(goal, member.name),
@@ -11836,6 +11976,7 @@ function startMemberBindingRuntime(ctx, goals, rosters, wakes, trials2) {
       recipient: { threadId: leadThreadId },
       requestId: `team-member-unbound-notice:${key}`,
       messageId: `team-member-unbound-notice-message:${key}`,
+      wake: { reason: "notice" },
       text: rebinding ? `Member ${member.name} (memberId ${member.memberId}) passed its trial run with the new setup but could not be moved onto it: ${failure.detail}. Work not yet handed to them waits until it is. Fix the cause, for example change their model with team_update_member; they are set up again within a couple of minutes.` : `Member ${member.name} (memberId ${member.memberId}) could not join this goal: ${failure.detail}. Work assigned to them waits until they join. Fix the cause, for example change their model with team_update_member; they are set up again within a couple of minutes.`
     });
     if (delivered) told.add(key);
@@ -12014,6 +12155,7 @@ function startMemberRemovalRuntime(ctx, goals, wakes) {
         recipient: { threadId: lead },
         requestId: `team-member-removed-notice:${key}`,
         messageId: `team-member-removed-notice-message:${key}`,
+        wake: { reason: "notice" },
         text: [
           `Member ${member.name} (memberId ${memberId}) was removed from this project's team.`,
           `Work that had not reached them yet was taken off them and now has no assignee: ${list(mine(taken))}. Assign it to another member with work_update_item.`,
@@ -13305,6 +13447,7 @@ function startWakeRuntime(ctx, goals, options = {}) {
           recipient: wake,
           requestId: wakeRequestId(id),
           messageId: `team-wake-msg:${id}`,
+          wake: { reason: "work", sequenceId: wake.sequenceId },
           memberWorktree: worktree === void 0 ? void 0 : { ...worktree, lane: worktrees },
           // 评论在收件人正在跑时插进当前这一轮，不排到这一轮结束（试跑 3：一轮 97 分钟，检查点落空）。
           ...wake.kind === "comment" ? { steer: true } : {},
@@ -13508,6 +13651,10 @@ function startRecoveryRuntime(ctx, goals, state, worktrees) {
           requestId: `team-recovery:${id}:${plan.action}`,
           messageId: `team-recovery-msg:${id}:${plan.action}`,
           text: plan.text,
+          // 续做与提醒是叫成员接着干活；告诉负责人谁停了是通知。
+          wake: {
+            reason: plan.action === "resume" || plan.action === "remind" ? "work" : "notice"
+          },
           memberWorktree: worktree === void 0 ? void 0 : { ...worktree, lane: worktrees }
         });
         if (!delivered) continue;
@@ -13599,7 +13746,8 @@ fired:${fired.wakes.length}`);
         recipient: { threadId },
         requestId: `team-lead-checkin:${threadId}:${key}`,
         messageId: `team-lead-checkin-message:${threadId}:${key}`,
-        text: LEAD_CHECKIN_REMINDER
+        text: LEAD_CHECKIN_REMINDER,
+        wake: { reason: "check-in" }
       });
     }
   };
@@ -14306,6 +14454,7 @@ function startHandbookRuntime(ctx, worktrees) {
           messageId: `team-handbook-msg:${id}`,
           // 成员闲着时被换版提醒叫醒，不能借机自己挑活：成员的提醒写死只确认、确认完就结束这一轮。
           text: handbookReminder(release, seat.goal.leadMemberId === member.memberId),
+          wake: { reason: "instructions" },
           memberWorktree: worktree === void 0 ? void 0 : { ...worktree, lane: worktrees.lane }
         });
         if (!delivered) continue;
@@ -15184,14 +15333,78 @@ function startLineNameMirror(ctx, queue) {
   });
 }
 
+// src/team/freeName.ts
+var NAME_RETRIES = 3;
+var nameTag = (seed, attempt) => attempt === 0 ? "" : ` #${stableHash(`${seed}${attempt}`).slice(0, 4)}`;
+var withNameTag = (name, tag2) => {
+  const base = name.trim().slice(0, MAX_MEMBER_NAME_LENGTH);
+  return tag2 === "" ? base : `${base.slice(0, MAX_MEMBER_NAME_LENGTH - tag2.length)}${tag2}`;
+};
+
+// src/team/ownerMember.ts
+async function ownerOf(ctx, threadId) {
+  const createdBy = (await ctx.threads.get({ threadId })).createdBy ?? null;
+  const person = createdBy === null ? { kind: "local-owner", environmentId: ctx.environment.id } : { kind: "account", userId: createdBy.userId };
+  return { person, createdName: createdBy?.displayName ?? null };
+}
+async function boundOwnerMember(ctx, projectId, threadId) {
+  const { person } = await ownerOf(ctx, threadId);
+  const { items } = await readPages(
+    Number.POSITIVE_INFINITY,
+    (page) => ctx.members.list({ projectId, ...page })
+  );
+  return items.find((row) => {
+    const held = row.kind === "human" && row.removedAt === null ? personOfMember(row) : null;
+    return held !== null && samePerson(held, person);
+  })?.memberId ?? null;
+}
+async function ensureOwnerMember(ctx, projectId, threadId, chosen) {
+  if (chosen !== null) return chosen;
+  const memberId = `person:${stableHash(JSON.stringify([projectId, threadId])).slice(0, 24)}`;
+  const mine = await findMember(ctx, projectId, memberId);
+  if (mine !== null) return mine.removedAt === null ? memberId : null;
+  const { person, createdName } = await ownerOf(ctx, threadId);
+  const name = await personDisplayName(ctx, projectId, person, createdName);
+  if (name === null) return null;
+  for (let attempt = 0; ; attempt++) {
+    const candidate = withNameTag(name, nameTag(threadId, attempt));
+    try {
+      await ctx.members.create({
+        projectId,
+        requestId: `team-owner-member:${mark(projectId, threadId, "owner")}:${attempt}`,
+        memberId,
+        kind: "human",
+        name: candidate,
+        identity: { kind: "human", principal: person }
+      });
+      return memberId;
+    } catch (error) {
+      const refusal = memberRefusal(error);
+      if (refusal?.code !== "duplicate-member") throw error;
+      const details = refusal.details;
+      if (typeof details === "object" && details !== null && Reflect.get(details, "field") === "identity")
+        return boundOwnerMember(ctx, projectId, threadId);
+      if (attempt >= NAME_RETRIES) throw error;
+    }
+  }
+}
+
 // src/team/open.ts
 var decodeOpen = decodeUnknownOption2(TeamOpenInput);
+var decodeOwner = decodeUnknownOption2(
+  Struct({ ownerMemberId: NullOr(String4) })
+);
 function statusOf2(trials2, projectId, member) {
   if (member.kind === "human") return "human";
   const view = trialViewOf(recordOf(trials2, projectId, member.memberId));
   if (view === null) return "ready";
   return view.status === "passed" || view.status === "overridden" ? "ready" : view.status === "failed" ? "trial-failed" : "trial-pending";
 }
+function leadMemberName(leadName, title, tag2) {
+  if (leadName !== void 0) return withNameTag(leadName, tag2);
+  const tail = ` lead${tag2}`;
+  return `${title.trim().slice(0, MAX_MEMBER_NAME_LENGTH - tail.length).trimEnd()}${tail}`.trim();
+}
 var remotePrincipalOf2 = (member) => member.identity?.kind === "remote-agent" ? member.identity.principalId : null;
 function createTeamOpener(ctx, deps, runner = createLineChangeRunner(ctx, deps), now3 = factTime) {
   const lineIdOf = (projectId, threadId, requestId) => `wl-${mark(projectId, threadId, requestId).slice(0, 24)}`;
@@ -15211,9 +15424,8 @@ function createTeamOpener(ctx, deps, runner = createLineChangeRunner(ctx, deps),
       ctx.projections.getThreadExecution(threadId)
     ]);
     if (execution === null) throw new TeamRuleError("not-local", teamMessage("notLocal"));
-    const base = (leadName ?? `${shell.title} lead`).trim().slice(0, 40);
     for (let attempt = 0; ; attempt++) {
-      const name = attempt === 0 ? base : `${base.slice(0, 33)} #${stableHash(`${threadId}${attempt}`).slice(0, 4)}`;
+      const name = leadMemberName(leadName, shell.title, nameTag(threadId, attempt));
       try {
         await ctx.members.create({
           projectId,
@@ -15228,7 +15440,7 @@ function createTeamOpener(ctx, deps, runner = createLineChangeRunner(ctx, deps),
         });
         return memberId;
       } catch (error) {
-        if (hostRefusalCode(error) !== "duplicate-member" || attempt >= 3) throw error;
+        if (hostRefusalCode(error) !== "duplicate-member" || attempt >= NAME_RETRIES) throw error;
       }
     }
   };
@@ -15265,6 +15477,17 @@ function createTeamOpener(ctx, deps, runner = createLineChangeRunner(ctx, deps),
     const local = rows.filter((row) => row.kind === "agent" && remotePrincipalOf2(row) === null);
     const selections = await resolveLocalSelections(projectId, local);
     const leadMemberId = await ensureLeadMember(projectId, callerThreadId, input.leadName);
+    const ownerMemberId = await ensureOwnerMember(
+      ctx,
+      projectId,
+      callerThreadId,
+      match(decodeOwner(intent.input), {
+        onNone: () => null,
+        onSome: (recorded) => recorded.ownerMemberId
+      })
+    );
+    const owner = ownerMemberId === null || rows.some((row) => row.memberId === ownerMemberId) ? null : await findMember(ctx, projectId, ownerMemberId);
+    const team = owner === null ? rows : [owner, ...rows];
     try {
       const created = await ctx.work.lines.create({
         projectId,
@@ -15272,7 +15495,7 @@ function createTeamOpener(ctx, deps, runner = createLineChangeRunner(ctx, deps),
         workLineId,
         name,
         leadMemberId,
-        members: [leadMemberId, ...rows.map((row) => row.memberId)],
+        members: [leadMemberId, ...team.map((row) => row.memberId)],
         threadId: callerThreadId
       });
       await ctx.events.append(baselineMirrored(projectId, workLineId, created.result.version));
@@ -15317,6 +15540,7 @@ function createTeamOpener(ctx, deps, runner = createLineChangeRunner(ctx, deps),
     for (const row of local) {
       await createTeamThread(ctx, {
         projectId,
+        memberId: row.memberId,
         threadId: teamThreadId(projectId, goalId, row.memberId),
         parentThreadId: callerThreadId,
         title: goalThreadTitle(goal, row.name),
@@ -15335,7 +15559,7 @@ function createTeamOpener(ctx, deps, runner = createLineChangeRunner(ctx, deps),
     });
     await syncLineTitle(ctx, projectId, workLineId);
     const trials2 = await deps.trials.get();
-    const roster = rows.map((row) => {
+    const roster = team.map((row) => {
       const principalId = remotePrincipalOf2(row);
       return {
         name: row.name,
@@ -15416,7 +15640,10 @@ function createTeamOpener(ctx, deps, runner = createLineChangeRunner(ctx, deps),
           projectId,
           rows.filter((row) => row.kind === "agent" && remotePrincipalOf2(row) === null)
         );
-        return input;
+        return {
+          ...input,
+          ownerMemberId: await boundOwnerMember(ctx, projectId, callerThreadId)
+        };
       }
     });
   };
@@ -15787,39 +16014,6 @@ async function teamWaitingList(ctx, memberThreads, nameOf2) {
   return waiting.length === 0 ? null : `${count(waiting.length, "member is", "members are")} waiting on the person: ${waiting.join("; ")}. These appear in this conversation for the person to answer; you cannot answer them and should not wait for them. Hand out work to members who are not blocked.`;
 }
 
-// ../../packages/ycodium-system-text/src/systemText.ts
-var SYSTEM_NOTIFICATION_OPEN_TAG = "<ycodium-system>";
-var SYSTEM_NOTIFICATION_CLOSE_TAG = "</ycodium-system>";
-var isSystemNotificationText = (text) => text.startsWith(SYSTEM_NOTIFICATION_OPEN_TAG);
-var rendersAsSystemMessage = (text) => isSystemNotificationText(text) && !(isPresetPrefixMessage(text) && text.includes(PRESET_PREFIX_CLOSE) && parsePresetPrefixText(text) === null);
-var FIRST_BLOCK_START = `^(?:${SYSTEM_NOTIFICATION_OPEN_TAG}\\n)?`;
-var PRESET_PREFIX_MESSAGE_START = `${SYSTEM_NOTIFICATION_OPEN_TAG}
-<preset-prefix `;
-var isPresetPrefixMessage = (text) => text.startsWith(PRESET_PREFIX_MESSAGE_START);
-var SYSTEM_TEXT_ESCAPED_ATTRIBUTE = 'esc="1"';
-var ESCAPED_BLOCK_NAMES = ["thread-response", "thread-handover", "scheduled-wake"];
-var ESCAPED_OPEN_LINE_PATTERN = new RegExp(
-  `^<(?:${ESCAPED_BLOCK_NAMES.join("|")})(?:\\s[^>]*)? ${SYSTEM_TEXT_ESCAPED_ATTRIBUTE}>$`
-);
-var PRESET_PREFIX_CLOSE = `
-</preset-prefix>
-${SYSTEM_NOTIFICATION_CLOSE_TAG}`;
-var PRESET_PREFIX_PATTERN = new RegExp(
-  `^${SYSTEM_NOTIFICATION_OPEN_TAG}\\n<preset-prefix id="([^"]*)">\\n([\\s\\S]*?)\\n</preset-prefix>\\n${SYSTEM_NOTIFICATION_CLOSE_TAG}(?:\\n\\n([\\s\\S]*))?$`
-);
-var parsePresetPrefixText = (text) => {
-  if (text.split(PRESET_PREFIX_CLOSE).length !== 2) return null;
-  const match7 = PRESET_PREFIX_PATTERN.exec(text);
-  if (match7 === null) return null;
-  const [, presetId, prefix, body] = match7;
-  if (!presetId) return null;
-  return { presetId, prefix: prefix ?? "", body: body ?? "" };
-};
-var userSpokenText = (text) => {
-  if (!rendersAsSystemMessage(text)) return text;
-  return parsePresetPrefixText(text)?.body || null;
-};
-
 // src/team/groupDigest.ts
 var DIGEST_LIMIT = 30;
 var SCAN_PAGES = 5;
@@ -16278,6 +16472,10 @@ var zh_CN_default = {
     kindAgentHint: "\u673A\u5668\u9009\u8FD9\u4E00\u53F0\u65F6\uFF0C\u7528\u4F60\u9009\u7684 provider \u548C\u6A21\u578B\u8FD0\u884C\u3002\u9009\u4E86\u522B\u7684\u673A\u5668\u7684\u6210\u5458\u8BD5\u8DD1\u4F1A\u51FA\u9519\uFF1A\u6539\u56DE\u8FD9\u4E00\u53F0\uFF0C\u6216\u8005\u8DF3\u8FC7\u8BD5\u8DD1\uFF0C\u5B83\u5C31\u5728\u8FD9\u53F0\u673A\u5668\u4E0A\u7528\u9879\u76EE\u7684\u9ED8\u8BA4\u6A21\u578B\u8FD0\u884C\u3002",
     kindRemoteHint: "\u4ECE\u53E6\u4E00\u53F0\u673A\u5668\u7528\u81EA\u5DF1\u7684\u51ED\u636E\u8FDE\u8FDB\u6765\u7684 agent\u3002",
     kindPersonHint: "\u56E2\u961F\u91CC\u7684\u4EBA\u3002\u4EBA\u4F1A\u5217\u5728\u6210\u5458\u91CC\uFF0C\u4F46\u4E0D\u4F1A\u8FD0\u884C\u4F1A\u8BDD\u3002",
+    thisIsMe: "\u8FD9\u662F\u6211",
+    thisIsMeHint: "\u6709\u4EBA\u5728\u56E2\u961F\u7FA4\u91CC @ \u8FD9\u4E2A\u6210\u5458\u65F6\uFF0C\u6D88\u606F\u4F1A\u8FDB\u4F60\u7684\u300C\u53D1\u7ED9\u6211\u7684\u300D\u3002",
+    boundToOther: "\u8FD9\u4E2A\u6210\u5458\u662F\u53E6\u4E00\u4E2A\u4EBA\uFF0C\u53EA\u6709\u5BF9\u65B9\u672C\u4EBA\u80FD\u6539\u8FD9\u4E00\u9879\u3002",
+    you: "\u6211",
     name: "\u540D\u5B57",
     memberTitle: "\u5934\u8854",
     responsibility: "\u804C\u8D23",
@@ -16324,6 +16522,7 @@ var zh_CN_default = {
       noDefaultModel: "\u8FD9\u4E2A\u9879\u76EE\u6CA1\u8BBE\u9ED8\u8BA4\u6A21\u578B\u3002\u5230\u9879\u76EE\u8BBE\u7F6E\u7684\u300C\u65B0\u4F1A\u8BDD \u2192 \u6A21\u578B\u300D\u9009\u4E00\u4E2A\uFF0C\u518D\u91CD\u8BD5\u3002",
       modelUnavailable: "\u8FD9\u4E2A\u9879\u76EE\u7684\u9ED8\u8BA4\u6A21\u578B\u5728\u8FD9\u53F0\u673A\u5668\u4E0A\u7528\u4E0D\u4E86\u3002\u68C0\u67E5\u4E00\u4E0B provider\uFF0C\u6216\u5230\u9879\u76EE\u8BBE\u7F6E\u7684\u300C\u65B0\u4F1A\u8BDD \u2192 \u6A21\u578B\u300D\u6362\u4E00\u4E2A\u3002",
       duplicateMember: "\u5DF2\u6709\u6210\u5458\u7528\u4E86\u8FD9\u4E2A\u540D\u5B57\u6216\u8FD9\u4E2A\u8FDC\u7AEF agent\uFF0C\u8BF7\u5148\u6539\u540D\u6216\u79FB\u9664\u5B83\u3002",
+      alreadyYou: "\u4F60\u5728\u540D\u518C\u4E0A\u5DF2\u7ECF\u662F\u300C{{name}}\u300D\u4E86\uFF0C\u8BF7\u5148\u5728\u300C{{name}}\u300D\u90A3\u91CC\u53D6\u6D88\u300C\u8FD9\u662F\u6211\u300D\u3002",
       staleVersion: "\u8FD9\u540D\u6210\u5458\u5DF2\u88AB\u522B\u5904\u6539\u8FC7\uFF0C\u5DF2\u91CD\u65B0\u8F7D\u5165\u3002\u8BF7\u786E\u8BA4\u540E\u518D\u4FDD\u5B58\u3002",
       notFound: "\u8FD9\u540D\u6210\u5458\u5DF2\u4E0D\u5B58\u5728\u3002",
       invalidState: "\u8FD9\u540D\u6210\u5458\u7684\u72B6\u6001\u5DF2\u88AB\u522B\u5904\u6539\u8FC7\uFF0C\u5DF2\u91CD\u65B0\u8F7D\u5165\u3002",
@@ -16742,6 +16941,7 @@ async function ensureSession(env, record2, ensured, prepared) {
       if (parentThreadId !== void 0)
         await createTeamThread(ctx, {
           projectId: record2.projectId,
+          memberId: record2.memberId,
           threadId: trialId,
           parentThreadId,
           title: member.name,
@@ -16752,6 +16952,7 @@ async function ensureSession(env, record2, ensured, prepared) {
           requestId: `thread:${trialId}`,
           threadId: trialId,
           projectId: record2.projectId,
+          memberId: record2.memberId,
           title: member.name,
           ...selection,
           // 与旧目标的成员一致：不然试跑里的工具调用会卡在审批上。
@@ -16766,7 +16967,7 @@ async function ensureSession(env, record2, ensured, prepared) {
         message: {
           messageId: `team-trial-message:${key}`,
           role: "user",
-          text: trialMessage("localPrompt", { trialId }),
+          text: teamWakeText({ reason: "instructions" }, trialMessage("localPrompt", { trialId })),
           attachments: []
         },
         modelSelection: selection.modelSelection,
@@ -16836,7 +17037,8 @@ async function tellLeads(env, leadThreads, projectId, key, text) {
       recipient: { threadId: leadThreadId },
       requestId,
       messageId: `${requestId}:message`,
-      text
+      text,
+      wake: { reason: "notice" }
     });
     delivered ||= sent;
   }
@@ -17262,7 +17464,7 @@ function startTrialRuntime(ctx, deps, options = {}) {
 // src/index.ts
 var index_default = definePlugin({
   id: "team",
-  apiVersion: 47,
+  apiVersion: 49,
   activate(ctx) {
     const trialState = ctx.derivedState(trialStateDefinition);
     const rosters = createRosterService(ctx);