happy-imou-cloud 2.1.28 → 2.1.30

package/dist/{api-DYS9sGJr.mjs → api-C68U-kRs.mjs}

@@ -18,7 +18,7 @@ import { spawn } from 'node:child_process';
 import { Expo } from 'expo-server-sdk';
 
 var name = "happy-imou-cloud";
-var version = "2.1.28";
+var version = "2.1.30";
 var description = "hicloud - Imou 企业定制版。关键是 happy！移动端远程 AI 编程工具，支持 Claude Code、Codex 和 Gemini CLI";
 var author = "long.zhu";
 var license = "MIT";
@@ -1210,7 +1210,9 @@ const HappyOrgTaskContextSchema = z$1.object({
   taskId: z$1.string().min(1),
   organizationId: z$1.string().min(1),
   memberAgentId: z$1.string().min(1),
-  supervisorAgentId: z$1.string().min(1)
+  supervisorAgentId: z$1.string().min(1),
+  positionId: z$1.string().min(1).optional().nullable(),
+  responsibilityId: z$1.string().min(1).optional().nullable()
 });
 const HappyOrgTaskControlSchema = z$1.object({
   action: z$1.enum(["terminate", "reopen"]),
@@ -1222,7 +1224,9 @@ const HappyOrgTaskControlSchema = z$1.object({
 const HappyOrgReplyContextSchema = z$1.object({
   dispatchId: z$1.string().min(1),
   scope: z$1.string().min(1),
-  replyTo: z$1.string().min(1)
+  replyTo: z$1.string().min(1),
+  positionId: z$1.string().min(1).optional().nullable(),
+  responsibilityId: z$1.string().min(1).optional().nullable()
 });
 const HappyOrgDispatchBusinessAckStatusSchema = z$1.enum([
   "accepted",
@@ -1575,6 +1579,15 @@ const AgentMessageSchema = z$1.object({
 const MessageContentSchema = z$1.union([UserMessageSchema, AgentMessageSchema]);
 
 const HAPPY_ORG_LOCAL_REPO_SCHEMA_VERSION = "1.7.3-local-repo-v1";
+const HAPPY_ORG_WRITER_LOCK_SCHEMA_VERSION = "1.7.3-writer-lock-v1";
+const WRITER_LOCK_LEASE_DURATION_SECONDS = 900;
+const WRITER_LOCK_RENEW_BEFORE_SECONDS = 300;
+const WRITER_LOCK_CEO_TAKEOVER_AFTER_SECONDS = 1800;
+const WRITER_LOCK_RENEW_INTERVAL_MS = Math.max(
+  (WRITER_LOCK_LEASE_DURATION_SECONDS - WRITER_LOCK_RENEW_BEFORE_SECONDS) * 1e3,
+  1e3
+);
+let writerLockSequence = 0;
 const TaskStatusSchema = z$1.enum([
   "draft",
   "ready",
@@ -1658,10 +1671,46 @@ const UpdateTaskRequestSchema = BaseRequestSchema.extend({
   expectedRevision: z$1.number().nullable(),
   nextState: TaskUpdatePayloadSchema
 });
+const AgentUpsertPayloadSchema = z$1.object({
+  id: z$1.string().min(1),
+  slug: z$1.string().min(1),
+  role: z$1.string().min(1),
+  name: z$1.string().min(1),
+  sessionId: z$1.string().min(1),
+  sessionTitle: z$1.string().min(1),
+  runtimePath: z$1.string().nullable(),
+  workingDirectoryRelativePath: z$1.string().nullable().optional(),
+  machineId: z$1.string().nullable(),
+  backend: z$1.string().nullable(),
+  supervisorAgentId: z$1.string().nullable(),
+  createdAt: z$1.number(),
+  updatedAt: z$1.number()
+});
+const PositionUpsertPayloadSchema = z$1.object({
+  positionId: z$1.string().min(1),
+  slug: z$1.string().min(1),
+  label: z$1.string().min(1),
+  role: z$1.string().nullable(),
+  workingDirectoryRelativePath: z$1.string().nullable(),
+  agentId: z$1.string().nullable(),
+  agentName: z$1.string().nullable(),
+  supervisorAgentId: z$1.string().nullable(),
+  responsibilityIds: z$1.array(z$1.string()),
+  occupancyStatus: z$1.enum(["occupied", "vacancy", "assigned", "active"]),
+  createdAt: z$1.number(),
+  updatedAt: z$1.number()
+});
+const UpsertAgentRequestSchema = BaseRequestSchema.extend({
+  requestType: z$1.literal("upsert_agent"),
+  agent: AgentUpsertPayloadSchema,
+  position: PositionUpsertPayloadSchema,
+  expectedRevision: z$1.number().nullable()
+});
 const RequestSchema = z$1.discriminatedUnion("requestType", [
   ReplaceGoalRequestSchema,
   CreateTaskRequestSchema,
-  UpdateTaskRequestSchema
+  UpdateTaskRequestSchema,
+  UpsertAgentRequestSchema
 ]);
 const RevisionEnvelopeSchema = (value) => z$1.object({
   schemaVersion: z$1.literal(HAPPY_ORG_LOCAL_REPO_SCHEMA_VERSION),
@@ -1674,16 +1723,23 @@ const PositionValueSchema = z$1.object({
   positionId: z$1.string(),
   slug: z$1.string(),
   label: z$1.string(),
-  role: z$1.string(),
-  agentId: z$1.string(),
-  agentName: z$1.string(),
+  role: z$1.string().nullable().optional(),
+  workingDirectoryRelativePath: z$1.string().nullable().optional(),
+  agentId: z$1.string().nullable().optional(),
+  agentName: z$1.string().nullable().optional(),
   supervisorAgentId: z$1.string().nullable(),
   responsibilityIds: z$1.array(z$1.string()),
-  occupancyStatus: z$1.enum(["occupied", "vacancy"]),
+  occupancyStatus: z$1.enum(["occupied", "vacancy", "assigned", "active"]),
   truthPath: z$1.string(),
   createdAt: z$1.number(),
   updatedAt: z$1.number()
 });
+const WorkspaceValueSchema = z$1.object({
+  positionId: z$1.string(),
+  slug: z$1.string(),
+  relativePath: z$1.string().nullable(),
+  updatedAt: z$1.number()
+});
 const ResponsibilityValueSchema = z$1.object({
   responsibilityId: z$1.string(),
   title: z$1.string(),
@@ -1693,6 +1749,7 @@ const ResponsibilityValueSchema = z$1.object({
   status: z$1.enum(["vacancy", "assigned", "in_progress"]),
   memberAgentId: z$1.string().nullable(),
   memberName: z$1.string().nullable(),
+  role: z$1.string().nullable().optional(),
   activeTaskId: z$1.string().nullable(),
   createdAt: z$1.number(),
   updatedAt: z$1.number()
@@ -1775,11 +1832,45 @@ const LogValueSchema = z$1.object({
 });
 const GoalEnvelopeSchema = RevisionEnvelopeSchema(GoalSchema);
 const PositionEnvelopeSchema = RevisionEnvelopeSchema(PositionValueSchema);
+const WorkspaceEnvelopeSchema = RevisionEnvelopeSchema(WorkspaceValueSchema);
 const ResponsibilityEnvelopeSchema = RevisionEnvelopeSchema(z$1.array(ResponsibilityValueSchema));
 const TaskEnvelopeSchema = RevisionEnvelopeSchema(TaskValueSchema);
 const WorkflowEnvelopeSchema = RevisionEnvelopeSchema(WorkflowValueSchema);
 const ResultEnvelopeSchema = RevisionEnvelopeSchema(ResultValueSchema);
 const LogEnvelopeSchema = RevisionEnvelopeSchema(LogValueSchema);
+const WriterLockRecordSchema = z$1.object({
+  schemaVersion: z$1.literal(HAPPY_ORG_WRITER_LOCK_SCHEMA_VERSION),
+  lockId: z$1.string().min(1),
+  target: z$1.string().min(1),
+  holderType: z$1.literal("cli-writer"),
+  holderId: z$1.string().min(1),
+  requestId: z$1.string().min(1),
+  pid: z$1.number().int().nonnegative(),
+  acquiredAt: z$1.number().int().nonnegative(),
+  renewedAt: z$1.number().int().nonnegative(),
+  expiresAt: z$1.number().int().nonnegative(),
+  leaseDurationSeconds: z$1.literal(WRITER_LOCK_LEASE_DURATION_SECONDS),
+  renewBeforeSeconds: z$1.literal(WRITER_LOCK_RENEW_BEFORE_SECONDS),
+  ceoTakeoverAfterSeconds: z$1.literal(WRITER_LOCK_CEO_TAKEOVER_AFTER_SECONDS),
+  takeoverOf: z$1.object({
+    lockId: z$1.string().min(1),
+    holderId: z$1.string().min(1),
+    requestId: z$1.string().min(1),
+    renewedAt: z$1.number().int().nonnegative()
+  }).nullable()
+});
+class WriterLockConflictError extends Error {
+  state;
+  target;
+  existing;
+  constructor(state, target, message, existing = null) {
+    super(message);
+    this.name = "WriterLockConflictError";
+    this.state = state;
+    this.target = target;
+    this.existing = existing;
+  }
+}
 function normalizePortablePath(value) {
   const trimmed = value?.trim();
   if (!trimmed) {
@@ -1787,14 +1878,37 @@ function normalizePortablePath(value) {
   }
   return trimmed.replace(/\\/g, "/").replace(/\/{2,}/g, "/").replace(/\/$/, "");
 }
+function normalizeRelativePath(value) {
+  const segments = (value ?? "").split(/[\\/]+/).map((segment) => segment.trim()).filter(Boolean).filter((segment) => segment !== "." && segment !== "..");
+  return segments.length > 0 ? segments.join("/") : null;
+}
+function resolveRelativePath(rootPath, relativePath) {
+  const normalizedRelativePath = normalizeRelativePath(relativePath);
+  if (!normalizedRelativePath) {
+    return null;
+  }
+  return path.join(rootPath, ...normalizedRelativePath.split("/"));
+}
+function normalizeOccupancyStatus(value) {
+  switch (value) {
+    case "vacancy":
+      return "vacancy";
+    case "active":
+      return "active";
+    case "assigned":
+    case "occupied":
+    default:
+      return "assigned";
+  }
+}
 function normalizeAdviceRoute(value) {
   return value === "gm" || value === "lead" || value === "user" ? value : null;
 }
 function buildResponsibilityId(slug) {
   return `responsibility-${slug}`;
 }
-function buildPositionId(slug) {
-  return `position-${slug}`;
+function buildPositionRoot(rootPath, slug) {
+  return path.join(rootPath, "positions", slug);
 }
 function toTaskSlug(taskId, title) {
   const slug = title.trim().toLowerCase().replace(/[^a-z0-9\u4e00-\u9fa5]+/g, "-").replace(/^-+|-+$/g, "");
@@ -1839,6 +1953,74 @@ function buildRequestFilePath(rootPath, requestId) {
 function buildTaskRoot(rootPath, taskId) {
   return path.join(rootPath, "tasks", taskId);
 }
+function nextWriterLockId() {
+  writerLockSequence += 1;
+  return `writer-lock-${process.pid}-${Date.now().toString(36)}-${writerLockSequence.toString(36)}`;
+}
+function normalizeWriterLockTarget(target) {
+  return target.trim().toLowerCase().replace(/[^a-z0-9._-]+/g, "-").replace(/^-+|-+$/g, "") || "writer-lock";
+}
+function buildWriterLockPath(rootPath, target) {
+  return path.join(rootPath, ".runtime", "locks", `${normalizeWriterLockTarget(target)}.lock.json`);
+}
+function buildWriterLockRecord(params) {
+  const now = params.now ?? Date.now();
+  return {
+    schemaVersion: HAPPY_ORG_WRITER_LOCK_SCHEMA_VERSION,
+    lockId: nextWriterLockId(),
+    target: params.target,
+    holderType: "cli-writer",
+    holderId: params.holderId,
+    requestId: params.requestId,
+    pid: process.pid,
+    acquiredAt: now,
+    renewedAt: now,
+    expiresAt: now + WRITER_LOCK_LEASE_DURATION_SECONDS * 1e3,
+    leaseDurationSeconds: WRITER_LOCK_LEASE_DURATION_SECONDS,
+    renewBeforeSeconds: WRITER_LOCK_RENEW_BEFORE_SECONDS,
+    ceoTakeoverAfterSeconds: WRITER_LOCK_CEO_TAKEOVER_AFTER_SECONDS,
+    takeoverOf: params.takeoverOf ? {
+      lockId: params.takeoverOf.lockId,
+      holderId: params.takeoverOf.holderId,
+      requestId: params.takeoverOf.requestId,
+      renewedAt: params.takeoverOf.renewedAt
+    } : null
+  };
+}
+function getWriterLockAgeMs(lock, now) {
+  return Math.max(now - Math.max(lock.renewedAt, lock.acquiredAt), 0);
+}
+async function removeWriterLockFile(lockPath) {
+  await unlink(lockPath).catch(async () => {
+    await rm(lockPath, { force: true });
+  });
+}
+async function readWriterLockRecord(lockPath) {
+  const payload = await readJson(lockPath);
+  const parsed = WriterLockRecordSchema.safeParse(payload);
+  return parsed.success ? parsed.data : null;
+}
+function isFileExistsError(error) {
+  return typeof error === "object" && error !== null && "code" in error && error.code === "EEXIST";
+}
+function isFileNotFoundError(error) {
+  return typeof error === "object" && error !== null && "code" in error && error.code === "ENOENT";
+}
+function getWriterLockTargetsForRequest(request) {
+  if (request.requestType === "replace_goal") {
+    return ["goal"];
+  }
+  if (request.requestType === "upsert_agent") {
+    return [`position-${request.position.positionId}`, "responsibilities"];
+  }
+  if (request.requestType === "create_task") {
+    return ["task-create", "responsibilities"];
+  }
+  return [`task-${request.taskId}`, "responsibilities"];
+}
+function getWriterLockTargetsForTurnReport(taskId) {
+  return [`task-${taskId}`, "responsibilities"];
+}
 async function loadTaskEnvelope(rootPath, taskId) {
   const taskRoot = buildTaskRoot(rootPath, taskId);
   const task = await readEnvelope(path.join(taskRoot, "TASK.json"), TaskEnvelopeSchema);
@@ -1863,15 +2045,52 @@ async function nextTaskId(rootPath) {
   const nextNumber = taskIds.map((taskId) => Number.parseInt(taskId.replace(/^T-/, ""), 10)).filter((value) => Number.isFinite(value)).reduce((max, value) => Math.max(max, value), 0) + 1;
   return `T-${String(nextNumber).padStart(3, "0")}`;
 }
-async function listPositionEnvelopes(rootPath) {
+async function listPositionEntries(rootPath) {
   try {
     const entries = await readdir(path.join(rootPath, "positions"), { withFileTypes: true });
-    const envelopes = await Promise.all(entries.filter((entry) => entry.isFile() && entry.name.endsWith(".json")).map((entry) => readEnvelope(path.join(rootPath, "positions", entry.name), PositionEnvelopeSchema)));
-    return envelopes.filter((entry) => entry !== null);
+    const positionEntries = await Promise.all(entries.map(async (entry) => {
+      if (entry.isDirectory()) {
+        const positionRoot = path.join(rootPath, "positions", entry.name);
+        const position = await readEnvelope(path.join(positionRoot, "POSITION.json"), PositionEnvelopeSchema);
+        if (!position) {
+          return null;
+        }
+        const workspace = await readEnvelope(path.join(positionRoot, "WORKSPACE.json"), WorkspaceEnvelopeSchema);
+        return {
+          position,
+          workspace,
+          source: "directory"
+        };
+      }
+      if (entry.isFile() && entry.name.endsWith(".json")) {
+        const position = await readEnvelope(path.join(rootPath, "positions", entry.name), PositionEnvelopeSchema);
+        if (!position) {
+          return null;
+        }
+        return {
+          position,
+          workspace: null,
+          source: "legacy-file"
+        };
+      }
+      return null;
+    }));
+    const deduped = /* @__PURE__ */ new Map();
+    for (const entry of positionEntries.filter((value) => value !== null)) {
+      const key = entry.position.value.positionId;
+      const existing = deduped.get(key) ?? null;
+      if (!existing || existing.source === "legacy-file" && entry.source === "directory") {
+        deduped.set(key, entry);
+      }
+    }
+    return [...deduped.values()];
   } catch {
     return [];
   }
 }
+async function listPositionEnvelopes(rootPath) {
+  return (await listPositionEntries(rootPath)).map((entry) => entry.position);
+}
 async function readResponsibilities(rootPath) {
   return await readEnvelope(path.join(rootPath, "RESPONSIBILITIES.json"), ResponsibilityEnvelopeSchema);
 }
@@ -1904,16 +2123,18 @@ async function rebuildResponsibilities(rootPath) {
   const existing = await readResponsibilities(rootPath);
   const previousRevision = existing?.revision ?? 0;
   const responsibilities = positions.map((position) => {
-    const activeTask = normalizedTasks.filter((task) => task.ownerAgentId === position.value.agentId && task.status !== "done" && task.status !== "terminated").sort((left, right) => right.updatedAt - left.updatedAt)[0] ?? null;
+    const responsibilityId = position.value.responsibilityIds[0] ?? buildResponsibilityId(position.value.slug);
+    const activeTask = normalizedTasks.filter((task) => task.status !== "done" && task.status !== "terminated").filter((task) => task.responsibilityId === responsibilityId || (position.value.agentId ? task.ownerAgentId === position.value.agentId : false)).sort((left, right) => right.updatedAt - left.updatedAt)[0] ?? null;
     return {
-      responsibilityId: buildResponsibilityId(position.value.slug),
-      title: `${position.value.agentName} responsibility`,
+      responsibilityId,
+      title: position.value.label || position.value.agentName || `${position.value.slug} responsibility`,
       summary: activeTask?.summary ?? null,
-      positionId: buildPositionId(position.value.slug),
-      participantType: "agent",
-      status: activeTask ? "in_progress" : "assigned",
-      memberAgentId: position.value.agentId,
-      memberName: position.value.agentName,
+      positionId: position.value.positionId,
+      participantType: position.value.agentId ? "agent" : "vacancy",
+      status: position.value.agentId ? activeTask ? "in_progress" : "assigned" : "vacancy",
+      memberAgentId: position.value.agentId ?? null,
+      memberName: position.value.agentName ?? null,
+      role: position.value.role ?? null,
       activeTaskId: activeTask?.taskId ?? null,
       createdAt: position.value.createdAt,
       updatedAt: Math.max(position.value.updatedAt, activeTask?.updatedAt ?? 0)
@@ -1984,12 +2205,104 @@ async function applyReplaceGoalRequest(rootPath, request) {
     message: "goal updated"
   };
 }
+async function applyUpsertAgentRequest(rootPath, request) {
+  const positionEntries = await listPositionEntries(rootPath);
+  const existingPosition = positionEntries.find((entry) => entry.position.value.positionId === request.position.positionId || entry.position.value.slug === request.position.slug || entry.position.value.agentId === request.agent.id) ?? null;
+  if (request.expectedRevision !== null && existingPosition?.position.revision !== request.expectedRevision) {
+    const message = existingPosition ? `Position revision mismatch: expected ${request.expectedRevision}, got ${existingPosition.position.revision}` : `Position ${request.position.positionId} not found for expected revision ${request.expectedRevision}`;
+    await updateRequestRecord(rootPath, request, {
+      requestState: "recovery_required",
+      processedAt: Date.now(),
+      resultMessage: message
+    });
+    return {
+      outcome: "recovery_required",
+      requestId: request.requestId,
+      taskId: null,
+      message
+    };
+  }
+  const positionRoot = buildPositionRoot(rootPath, request.position.slug);
+  const now = Date.now();
+  const positionValue = {
+    positionId: request.position.positionId,
+    slug: request.position.slug,
+    label: request.position.label,
+    role: request.position.role ?? request.agent.role,
+    workingDirectoryRelativePath: normalizeRelativePath(
+      request.position.workingDirectoryRelativePath ?? request.agent.workingDirectoryRelativePath
+    ),
+    agentId: request.position.agentId ?? request.agent.id,
+    agentName: request.position.agentName ?? request.agent.name,
+    supervisorAgentId: request.position.supervisorAgentId ?? request.agent.supervisorAgentId,
+    responsibilityIds: request.position.responsibilityIds.length > 0 ? request.position.responsibilityIds : [buildResponsibilityId(request.position.slug)],
+    occupancyStatus: normalizeOccupancyStatus(request.position.occupancyStatus),
+    truthPath: `positions/${request.position.slug}/POSITION.json`,
+    createdAt: request.position.createdAt,
+    updatedAt: request.agent.updatedAt
+  };
+  const existingWorkspace = existingPosition?.workspace ?? null;
+  const workspaceValue = {
+    positionId: request.position.positionId,
+    slug: request.position.slug,
+    relativePath: normalizeRelativePath(
+      request.position.workingDirectoryRelativePath ?? request.agent.workingDirectoryRelativePath
+    ),
+    updatedAt: request.agent.updatedAt
+  };
+  const runtimeValue = {
+    agentId: request.agent.id,
+    slug: request.agent.slug,
+    role: request.agent.role,
+    sessionId: request.agent.sessionId,
+    sessionTitle: request.agent.sessionTitle,
+    runtimePath: request.agent.runtimePath,
+    assignedWorkingDirectoryRelativePath: workspaceValue.relativePath,
+    assignedWorkingDirectoryPath: resolveRelativePath(rootPath, workspaceValue.relativePath),
+    machineId: request.agent.machineId,
+    backend: request.agent.backend,
+    updatedAt: request.agent.updatedAt
+  };
+  await ensureDir(positionRoot);
+  await writeEnvelope(path.join(positionRoot, "POSITION.json"), {
+    schemaVersion: HAPPY_ORG_LOCAL_REPO_SCHEMA_VERSION,
+    revision: existingPosition && JSON.stringify(existingPosition.position.value) === JSON.stringify(positionValue) ? existingPosition.position.revision : (existingPosition?.position.revision ?? 0) + 1,
+    updatedAt: now,
+    updatedBy: request.agent.id,
+    value: positionValue
+  });
+  await writeEnvelope(path.join(positionRoot, "WORKSPACE.json"), {
+    schemaVersion: HAPPY_ORG_LOCAL_REPO_SCHEMA_VERSION,
+    revision: existingWorkspace && JSON.stringify(existingWorkspace.value) === JSON.stringify(workspaceValue) ? existingWorkspace.revision : (existingWorkspace?.revision ?? 0) + 1,
+    updatedAt: now,
+    updatedBy: request.agent.id,
+    value: workspaceValue
+  });
+  await writeJson(path.join(rootPath, ".runtime", "agents", `${request.agent.slug}.json`), runtimeValue);
+  if (existingPosition?.source === "legacy-file") {
+    await rm(path.join(rootPath, "positions", `${existingPosition.position.value.positionId}.json`), { force: true });
+  }
+  await rebuildResponsibilities(rootPath);
+  await updateRequestRecord(rootPath, request, {
+    requestState: "applied",
+    processedAt: now,
+    resultMessage: `upserted ${request.agent.id}`
+  });
+  return {
+    outcome: "applied",
+    requestId: request.requestId,
+    taskId: null,
+    message: `upserted ${request.agent.id}`
+  };
+}
 async function applyCreateTaskRequest(rootPath, request) {
   const taskId = await nextTaskId(rootPath);
   const taskRoot = buildTaskRoot(rootPath, taskId);
   const createdAt = Date.now();
   const title = request.title.trim();
   const position = (await listPositionEnvelopes(rootPath)).find((entry) => entry.value.agentId === request.ownerAgentId) ?? null;
+  const responsibilityId = position?.value.responsibilityIds[0] ?? (position ? buildResponsibilityId(position.value.slug) : null);
+  const responsibilityLabel = position?.value.label ?? `${request.ownerName} responsibility`;
   const taskValue = {
     taskId,
     slug: toTaskSlug(taskId, title),
@@ -1997,8 +2310,8 @@ async function applyCreateTaskRequest(rootPath, request) {
     ownerAgentId: request.ownerAgentId,
     ownerName: request.ownerName,
     ownerSessionId: request.ownerSessionId,
-    responsibilityId: position ? buildResponsibilityId(position.value.slug) : null,
-    responsibilityLabel: position ? `${position.value.agentName} responsibility` : `${request.ownerName} responsibility`,
+    responsibilityId,
+    responsibilityLabel,
     activeOwnerAgentId: null,
     hasActiveOwner: false,
     path: request.path,
@@ -2216,19 +2529,127 @@ async function applyUpdateTaskRequest(rootPath, request) {
     message: `updated ${request.taskId}`
   };
 }
-async function acquireWriterLock(rootPath) {
-  const lockPath = path.join(rootPath, ".runtime", "writer.lock.json");
+async function renewSingleWriterLock(lockPath, lockId) {
+  const existing = await readWriterLockRecord(lockPath);
+  if (!existing || existing.lockId !== lockId) {
+    return;
+  }
+  const now = Date.now();
+  await writeJson(lockPath, {
+    ...existing,
+    renewedAt: now,
+    expiresAt: now + WRITER_LOCK_LEASE_DURATION_SECONDS * 1e3
+  });
+}
+async function acquireSingleWriterLock(params) {
+  const lockPath = buildWriterLockPath(params.rootPath, params.target);
   await ensureDir(path.dirname(lockPath));
-  const handle = await open(lockPath, "wx");
-  await handle.writeFile(JSON.stringify({
-    acquiredAt: Date.now(),
-    pid: process.pid
-  }, null, 2), "utf8");
-  await handle.close();
-  return async () => {
-    await unlink(lockPath).catch(async () => {
-      await rm(lockPath, { force: true });
+  let takeoverOf = null;
+  while (true) {
+    const now = Date.now();
+    const record = buildWriterLockRecord({
+      target: params.target,
+      holderId: params.holderId,
+      requestId: params.requestId,
+      takeoverOf,
+      now
     });
+    try {
+      const handle = await open(lockPath, "wx");
+      await handle.writeFile(JSON.stringify(record, null, 2), "utf8");
+      await handle.close();
+      const renewTimer = setInterval(() => {
+        void renewSingleWriterLock(lockPath, record.lockId);
+      }, WRITER_LOCK_RENEW_INTERVAL_MS);
+      renewTimer.unref?.();
+      return async () => {
+        clearInterval(renewTimer);
+        const existing = await readWriterLockRecord(lockPath);
+        if (!existing || existing.lockId !== record.lockId) {
+          return;
+        }
+        await removeWriterLockFile(lockPath);
+      };
+    } catch (error) {
+      if (!isFileExistsError(error)) {
+        throw error;
+      }
+      const existing = await readWriterLockRecord(lockPath);
+      if (!existing) {
+        try {
+          const info = await stat(lockPath);
+          const ageMs2 = Math.max(now - info.mtimeMs, 0);
+          if (ageMs2 >= WRITER_LOCK_CEO_TAKEOVER_AFTER_SECONDS * 1e3) {
+            await removeWriterLockFile(lockPath);
+            takeoverOf = null;
+            continue;
+          }
+        } catch (statError) {
+          if (isFileNotFoundError(statError)) {
+            takeoverOf = null;
+            continue;
+          }
+        }
+        throw new WriterLockConflictError(
+          "invalid",
+          params.target,
+          `Lock ${params.target} exists but is unreadable; mark recovery before retrying.`
+        );
+      }
+      const ageMs = getWriterLockAgeMs(existing, now);
+      if (ageMs >= WRITER_LOCK_CEO_TAKEOVER_AFTER_SECONDS * 1e3) {
+        await removeWriterLockFile(lockPath);
+        takeoverOf = existing;
+        continue;
+      }
+      if (ageMs >= WRITER_LOCK_LEASE_DURATION_SECONDS * 1e3) {
+        throw new WriterLockConflictError(
+          "stale",
+          params.target,
+          `Lock ${params.target} is stale for ${Math.floor(ageMs / 1e3)}s and requires CEO recovery before takeover.`,
+          existing
+        );
+      }
+      throw new WriterLockConflictError(
+        "active",
+        params.target,
+        `Lock ${params.target} is still held by ${existing.holderId} for request ${existing.requestId}.`,
+        existing
+      );
+    }
+  }
+}
+async function acquireWriterLocks(params) {
+  const holderId = `cli-writer:${process.pid}`;
+  const releaseSteps = [];
+  const orderedTargets = [...new Set(params.targets)].sort();
+  try {
+    for (const target of orderedTargets) {
+      releaseSteps.push(await acquireSingleWriterLock({
+        rootPath: params.rootPath,
+        target,
+        holderId,
+        requestId: params.requestId
+      }));
+    }
+  } catch (error) {
+    while (releaseSteps.length > 0) {
+      const release = releaseSteps.pop();
+      if (!release) {
+        continue;
+      }
+      await release();
+    }
+    throw error;
+  }
+  return async () => {
+    while (releaseSteps.length > 0) {
+      const release = releaseSteps.pop();
+      if (!release) {
+        continue;
+      }
+      await release();
+    }
   };
 }
 async function processSingleRequest(rootPath, request) {
@@ -2241,11 +2662,38 @@ async function processSingleRequest(rootPath, request) {
       message: request.resultMessage
     };
   }
-  const release = await acquireWriterLock(rootPath);
+  let lockConflictMessage = null;
+  const release = await acquireWriterLocks({
+    rootPath,
+    targets: getWriterLockTargetsForRequest(request),
+    requestId: request.requestId
+  }).catch(async (error) => {
+    if (error instanceof WriterLockConflictError) {
+      lockConflictMessage = error.message;
+      await updateRequestRecord(rootPath, request, {
+        requestState: "recovery_required",
+        processedAt: Date.now(),
+        resultMessage: error.message
+      });
+      return null;
+    }
+    throw error;
+  });
+  if (!release) {
+    return {
+      outcome: "recovery_required",
+      requestId: request.requestId,
+      taskId: "taskId" in request ? request.taskId : null,
+      message: lockConflictMessage
+    };
+  }
   try {
     if (request.requestType === "replace_goal") {
       return await applyReplaceGoalRequest(rootPath, request);
     }
+    if (request.requestType === "upsert_agent") {
+      return await applyUpsertAgentRequest(rootPath, request);
+    }
     if (request.requestType === "create_task") {
       return await applyCreateTaskRequest(rootPath, request);
     }
@@ -2286,99 +2734,125 @@ function nextStatusFromTurnReport(report) {
   return "active";
 }
 async function recordHappyOrgTurnReport(options) {
-  const bundle = await loadTaskEnvelope(options.rootPath, options.report.taskId);
-  if (!bundle) {
+  const requestId = `turn-report:${options.report.taskId}`;
+  let lockConflictMessage = null;
+  const release = await acquireWriterLocks({
+    rootPath: options.rootPath,
+    targets: getWriterLockTargetsForTurnReport(options.report.taskId),
+    requestId
+  }).catch((error) => {
+    if (error instanceof WriterLockConflictError) {
+      lockConflictMessage = error.message;
+      return null;
+    }
+    throw error;
+  });
+  if (!release) {
     return {
       outcome: "recovery_required",
-      requestId: `turn-report:${options.report.taskId}`,
+      requestId,
       taskId: options.report.taskId,
-      message: `Task ${options.report.taskId} not found`
+      message: lockConflictMessage ?? `Turn report blocked by writer lock for ${options.report.taskId}`
     };
   }
-  const now = Date.now();
-  const nextStatus = nextStatusFromTurnReport(options.report);
-  const nextTaskValue = {
-    ...bundle.task.value,
-    status: nextStatus,
-    summary: options.report.summary,
-    resultSummary: options.report.turnStatus === "task_complete" ? options.report.summary : bundle.task.value.resultSummary,
-    blocker: nextStatus === "blocked" ? options.report.summary || options.report.blockerCode : null,
-    decisionNeeded: nextStatus === "waiting_decision" ? options.report.decisionNeeded ?? options.report.summary : null,
-    updatedAt: now,
-    lastUpdatedBy: options.report.memberAgentId,
-    activeOwnerAgentId: options.report.memberAgentId,
-    hasActiveOwner: nextStatus === "active",
-    path: options.report.targetArtifact ?? bundle.task.value.path,
-    portablePath: normalizePortablePath(options.report.targetArtifact ?? bundle.task.value.path)
-  };
-  await writeEnvelope(path.join(buildTaskRoot(options.rootPath, options.report.taskId), "TASK.json"), {
-    ...bundle.task,
-    revision: bundle.task.revision + 1,
-    updatedAt: now,
-    updatedBy: options.report.memberAgentId,
-    value: nextTaskValue
-  });
-  await writeEnvelope(path.join(buildTaskRoot(options.rootPath, options.report.taskId), "WORKFLOW.json"), {
-    schemaVersion: HAPPY_ORG_LOCAL_REPO_SCHEMA_VERSION,
-    revision: (bundle.workflow?.revision ?? 0) + 1,
-    updatedAt: now,
-    updatedBy: options.report.memberAgentId,
-    value: {
-      taskId: options.report.taskId,
+  try {
+    const bundle = await loadTaskEnvelope(options.rootPath, options.report.taskId);
+    if (!bundle) {
+      return {
+        outcome: "recovery_required",
+        requestId,
+        taskId: options.report.taskId,
+        message: `Task ${options.report.taskId} not found`
+      };
+    }
+    const now = Date.now();
+    const nextStatus = nextStatusFromTurnReport(options.report);
+    const nextTaskValue = {
+      ...bundle.task.value,
       status: nextStatus,
       summary: options.report.summary,
-      blocker: nextStatus === "blocked" ? options.report.blockerCode ?? options.report.summary : null,
+      resultSummary: options.report.turnStatus === "task_complete" ? options.report.summary : bundle.task.value.resultSummary,
+      blocker: nextStatus === "blocked" ? options.report.summary || options.report.blockerCode : null,
       decisionNeeded: nextStatus === "waiting_decision" ? options.report.decisionNeeded ?? options.report.summary : null,
-      adviceRoute: null,
-      adviceSummary: null,
-      lastRequestId: null,
       updatedAt: now,
-      updatedBy: options.report.memberAgentId
-    }
-  });
-  await writeEnvelope(path.join(buildTaskRoot(options.rootPath, options.report.taskId), "RESULT.json"), {
-    schemaVersion: HAPPY_ORG_LOCAL_REPO_SCHEMA_VERSION,
-    revision: (bundle.result?.revision ?? 0) + 1,
-    updatedAt: now,
-    updatedBy: options.report.memberAgentId,
-    value: {
-      taskId: options.report.taskId,
-      resultSummary: options.report.turnStatus === "task_complete" ? options.report.summary : bundle.result?.value.resultSummary ?? bundle.task.value.resultSummary,
-      reviewSummary: bundle.result?.value.reviewSummary ?? null,
-      assetCaptureStatus: bundle.result?.value.assetCaptureStatus ?? null,
-      assetCaptureSummary: bundle.result?.value.assetCaptureSummary ?? null,
-      assetReference: options.report.targetArtifact ?? bundle.result?.value.assetReference ?? null,
-      closedAt: nextStatus === "waiting_close" ? now : bundle.result?.value.closedAt ?? null,
+      lastUpdatedBy: options.report.memberAgentId,
+      activeOwnerAgentId: options.report.memberAgentId,
+      hasActiveOwner: nextStatus === "active",
+      path: options.report.targetArtifact ?? bundle.task.value.path,
+      portablePath: normalizePortablePath(options.report.targetArtifact ?? bundle.task.value.path)
+    };
+    const taskRoot = buildTaskRoot(options.rootPath, options.report.taskId);
+    await writeEnvelope(path.join(taskRoot, "TASK.json"), {
+      ...bundle.task,
+      revision: bundle.task.revision + 1,
       updatedAt: now,
-      updatedBy: options.report.memberAgentId
-    }
-  });
-  await writeEnvelope(path.join(buildTaskRoot(options.rootPath, options.report.taskId), "LOG.json"), {
-    schemaVersion: HAPPY_ORG_LOCAL_REPO_SCHEMA_VERSION,
-    revision: (bundle.log?.revision ?? 0) + 1,
-    updatedAt: now,
-    updatedBy: options.report.memberAgentId,
-    value: {
+      updatedBy: options.report.memberAgentId,
+      value: nextTaskValue
+    });
+    await writeEnvelope(path.join(taskRoot, "WORKFLOW.json"), {
+      schemaVersion: HAPPY_ORG_LOCAL_REPO_SCHEMA_VERSION,
+      revision: (bundle.workflow?.revision ?? 0) + 1,
+      updatedAt: now,
+      updatedBy: options.report.memberAgentId,
+      value: {
+        taskId: options.report.taskId,
+        status: nextStatus,
+        summary: options.report.summary,
+        blocker: nextStatus === "blocked" ? options.report.blockerCode ?? options.report.summary : null,
+        decisionNeeded: nextStatus === "waiting_decision" ? options.report.decisionNeeded ?? options.report.summary : null,
+        adviceRoute: null,
+        adviceSummary: null,
+        lastRequestId: null,
+        updatedAt: now,
+        updatedBy: options.report.memberAgentId
+      }
+    });
+    await writeEnvelope(path.join(taskRoot, "RESULT.json"), {
+      schemaVersion: HAPPY_ORG_LOCAL_REPO_SCHEMA_VERSION,
+      revision: (bundle.result?.revision ?? 0) + 1,
+      updatedAt: now,
+      updatedBy: options.report.memberAgentId,
+      value: {
+        taskId: options.report.taskId,
+        resultSummary: options.report.turnStatus === "task_complete" ? options.report.summary : bundle.result?.value.resultSummary ?? bundle.task.value.resultSummary,
+        reviewSummary: bundle.result?.value.reviewSummary ?? null,
+        assetCaptureStatus: bundle.result?.value.assetCaptureStatus ?? null,
+        assetCaptureSummary: bundle.result?.value.assetCaptureSummary ?? null,
+        assetReference: options.report.targetArtifact ?? bundle.result?.value.assetReference ?? null,
+        closedAt: nextStatus === "waiting_close" ? now : bundle.result?.value.closedAt ?? null,
+        updatedAt: now,
+        updatedBy: options.report.memberAgentId
+      }
+    });
+    await writeEnvelope(path.join(taskRoot, "LOG.json"), {
+      schemaVersion: HAPPY_ORG_LOCAL_REPO_SCHEMA_VERSION,
+      revision: (bundle.log?.revision ?? 0) + 1,
+      updatedAt: now,
+      updatedBy: options.report.memberAgentId,
+      value: {
+        taskId: options.report.taskId,
+        entries: [
+          ...bundle.log?.value.entries ?? [],
+          buildTaskLogEntry(
+            "turn_report",
+            `Recorded ${options.report.turnStatus} from ${options.report.memberAgentId}`,
+            options.report.summary,
+            options.report.memberAgentId,
+            now
+          )
+        ]
+      }
+    });
+    await rebuildResponsibilities(options.rootPath);
+    return {
+      outcome: "applied",
+      requestId,
       taskId: options.report.taskId,
-      entries: [
-        ...bundle.log?.value.entries ?? [],
-        buildTaskLogEntry(
-          "turn_report",
-          `Recorded ${options.report.turnStatus} from ${options.report.memberAgentId}`,
-          options.report.summary,
-          options.report.memberAgentId,
-          now
-        )
-      ]
-    }
-  });
-  await rebuildResponsibilities(options.rootPath);
-  return {
-    outcome: "applied",
-    requestId: `turn-report:${options.report.taskId}`,
-    taskId: options.report.taskId,
-    message: `recorded turn report for ${options.report.taskId}`
-  };
+      message: `recorded turn report for ${options.report.taskId}`
+    };
+  } finally {
+    await release();
+  }
 }
 
 function buildSessionRuntimeIndex(metadata) {
@@ -3326,6 +3800,9 @@ const PROTOCOL_V3_CHANGES_PAGE_LIMIT = 200;
 const PROTOCOL_V3_CAPABILITIES_WAIT_MS = 250;
 const COMMITTED_SESSION_WRITE_ACK_TIMEOUT_MS = 5e3;
 const RELIABLE_SESSION_MESSAGE_RETRY_DELAY_MS = 250;
+const LEGACY_CONTROL_ACK_HEADER$1 = Object.freeze({
+  "x-happy-legacy-control-ack": "happy-org-1.7.3-legacy-write"
+});
 function normalizeHappyOrgOptionalText(value) {
   if (typeof value !== "string") {
     return null;
@@ -3363,6 +3840,12 @@ function buildHappyOrgTurnReportSubmissionKey(messageId, report) {
     report.summary.trim()
   ].join(":");
 }
+function withLegacyControlAck$1(headers) {
+  return {
+    ...headers ?? {},
+    ...LEGACY_CONTROL_ACK_HEADER$1
+  };
+}
 function parseHappyOrgFallbackEnvelope(rawEnvelope) {
   try {
     const parsed = JSON.parse(rawEnvelope);
@@ -3383,7 +3866,9 @@ function parseHappyOrgFallbackEnvelope(rawEnvelope) {
       replyTo,
       organizationId: typeof parsed.organization_id === "string" ? parsed.organization_id.trim() : null,
       memberAgentId: typeof parsed.member_agent_id === "string" ? parsed.member_agent_id.trim() : null,
-      supervisorAgentId: typeof parsed.supervisor_agent_id === "string" ? parsed.supervisor_agent_id.trim() : null
+      supervisorAgentId: typeof parsed.supervisor_agent_id === "string" ? parsed.supervisor_agent_id.trim() : null,
+      positionId: typeof parsed.position_id === "string" ? parsed.position_id.trim() : null,
+      responsibilityId: typeof parsed.responsibility_id === "string" ? parsed.responsibility_id.trim() : null
     };
   } catch {
     return null;
@@ -3400,13 +3885,17 @@ function buildHappyOrgFallbackUserMessage(rawEnvelope) {
         taskId: envelope.taskId,
         organizationId: envelope.organizationId,
         memberAgentId: envelope.memberAgentId,
-        supervisorAgentId: envelope.supervisorAgentId
+        supervisorAgentId: envelope.supervisorAgentId,
+        ...envelope.positionId ? { positionId: envelope.positionId } : {},
+        ...envelope.responsibilityId ? { responsibilityId: envelope.responsibilityId } : {}
       }
     } : {},
     replyContext: {
       dispatchId: envelope.dispatchId,
       scope: envelope.scope,
-      replyTo: envelope.replyTo
+      replyTo: envelope.replyTo,
+      ...envelope.positionId ? { positionId: envelope.positionId } : {},
+      ...envelope.responsibilityId ? { responsibilityId: envelope.responsibilityId } : {}
     }
   };
   return {
@@ -4195,10 +4684,10 @@ class ApiSessionClient extends EventEmitter {
           url,
           body: payload,
           signRequest: true,
-          headers: {
+          headers: withLegacyControlAck$1({
             "Content-Type": "application/json",
             "x-happy-organization-id": report.organizationId
-          }
+          })
         }),
         timeout: 1e4
       });
@@ -4298,10 +4787,10 @@ class ApiSessionClient extends EventEmitter {
           url,
           body: payload,
           signRequest: true,
-          headers: {
+          headers: withLegacyControlAck$1({
             "Content-Type": "application/json",
             "x-happy-organization-id": candidate.organizationId
-          }
+          })
         }),
         timeout: 1e4
       });
@@ -5540,6 +6029,15 @@ async function deriveKey(master, usage, path) {
 }
 
 const SESSION_DATA_KEY_USAGE = "Happy Session Data Key";
+const LEGACY_CONTROL_ACK_HEADER = Object.freeze({
+  "x-happy-legacy-control-ack": "happy-org-1.7.3-legacy-write"
+});
+function withLegacyControlAck(headers) {
+  return {
+    ...headers ?? {},
+    ...LEGACY_CONTROL_ACK_HEADER
+  };
+}
 class ApiClient {
   static async create(credential) {
     return new ApiClient(credential);
@@ -5636,9 +6134,11 @@ class ApiClient {
         allowed_paths: opts.allowedPaths,
         forbidden_paths: opts.forbiddenPaths ?? [],
         cross_scope_policy: "ask-first",
+        position_id: opts.positionId ?? null,
+        responsibility_id: opts.responsibilityId ?? null,
         note: opts.note ?? null
       },
-      headers: { "x-happy-organization-id": opts.organizationId },
+      headers: withLegacyControlAck({ "x-happy-organization-id": opts.organizationId }),
       timeout: 1e4
     });
     return response.data.receipt;
@@ -5664,7 +6164,7 @@ class ApiClient {
         status: opts.status,
         note: opts.note ?? null
       },
-      headers: { "x-happy-organization-id": opts.organizationId },
+      headers: withLegacyControlAck({ "x-happy-organization-id": opts.organizationId }),
       timeout: 1e4
     });
     return response.data.receipt;