@markjaquith/agency 2.54.3 → 2.55.0

package/src/workbase/opencode-plugin-file.ts

@@ -7,9 +7,41 @@ const checksum = (content: string) =>
 	createHash("sha256").update(content).digest("hex")
 
 const body = `import { existsSync, readFileSync } from "node:fs"
-import { dirname, join, sep } from "node:path"
+import { dirname, join, resolve, sep } from "node:path"
 import type { Plugin } from "@opencode-ai/plugin"
 
+const workerLaunchPattern = /^Agency worker launch target: ([^.\\s]+)\\./
+
+type AgencyContext = {
+  root?: string
+  checkout?: string
+  target?: string
+  task?: string
+  phase?: string
+}
+
+const contextTarget = (result: Record<string, any>): string | undefined => {
+  const target = result.target
+  if (target?.kind === "epic") return \`epic:\${target.epicId}\`
+  if (target?.kind === "phase") {
+    return \`execution-unit:phase/\${target.taskId}/\${target.phaseId}\`
+  }
+  if (target?.kind === "task") {
+    return result.authority?.mode === "execution"
+      ? \`execution-unit:task/\${target.taskId}\`
+      : \`task:\${target.taskId}\`
+  }
+}
+
+const workerLaunchTarget = (parts: unknown) => {
+  if (!Array.isArray(parts)) return
+  const text = parts
+    .filter((part) => part.type === "text")
+    .map((part) => part.text ?? "")
+    .join("\\n")
+  return text.match(workerLaunchPattern)?.[1]
+}
+
 const discoverWorkbase = (directory: string) => {
   let current = directory
   while (true) {
@@ -37,64 +69,117 @@ const discoverCheckout = (directory: string, root: string | undefined) => {
   }
 }
 
-const agencyContext = async (directory: string) => {
-  const task = process.env.AGENCY_TASK_ID
-  const phase = process.env.AGENCY_PHASE_ID
+const agencyContext = async (
+  directory: string,
+  useEnvironmentTarget = true,
+): Promise<AgencyContext | undefined> => {
+  const task = useEnvironmentTarget ? process.env.AGENCY_TASK_ID : undefined
+  const phase = useEnvironmentTarget ? process.env.AGENCY_PHASE_ID : undefined
   const args = task
     ? ["agency", "context", "--task", task, ...(phase ? ["--phase", phase] : []), "--compact", "--json"]
     : ["agency", "context", ".", "--compact", "--json"]
-  const child = Bun.spawn(args, { cwd: directory, stdout: "pipe", stderr: "ignore" })
+  const child = Bun.spawn(args, {
+    cwd: directory,
+    env: process.env,
+    stdout: "pipe",
+    stderr: "ignore",
+  })
   const output = await new Response(child.stdout).text()
   if ((await child.exited) !== 0) return
   const envelope = JSON.parse(output)
   if (envelope.ok !== true) return
+  const result = envelope.result ?? {}
+  const target = contextTarget(result)
+  const document = result.target?.path
+  const status = result.documents?.phase?.data?.status ?? result.documents?.task?.data?.status
+  if (
+    result.validation?.valid !== true ||
+    !target ||
+    !document ||
+    dirname(document) !== resolve(directory) ||
+    (target.startsWith("execution-unit:") &&
+      (!result.authority?.writable?.checkoutPath || status !== "working"))
+  ) return
   return {
-    root: envelope.result?.workbase?.root as string | undefined,
-    checkout: envelope.result?.authority?.writable?.checkoutPath as string | undefined,
+    root: result.workbase?.root,
+    checkout: result.authority?.writable?.checkoutPath,
+    target,
+    task: result.target?.taskId,
+    phase: result.target?.phaseId,
   }
 }
 
-const plugin: Plugin = async ({ directory }) => ({
-  config: async (config) => {
-    const context = await agencyContext(directory).catch(() => undefined)
-    const root = process.env.AGENCY_WORKBASE ?? context?.root ?? discoverWorkbase(directory)
-    const checkout = process.env.AGENCY_WRITABLE_CHECKOUT ?? context?.checkout ?? discoverCheckout(directory, root)
-
-    const reference = config.references?.workbase
-    if (
-      root &&
-      typeof reference === "object" &&
-      reference.path === ".." &&
-      reference.description ===
-        "Complete Agency workbase context; write authority still comes only from agency context" &&
-      typeof config.permission !== "string"
-    ) {
-      config.permission ??= {}
-      const external = config.permission.external_directory
-      if (external === undefined) {
-        config.permission.external_directory = { [join(root, "*")]: "allow" }
-      } else if (typeof external === "object") {
-        config.permission.external_directory = {
-          [join(root, "*")]: "allow",
-          ...external,
+const plugin: Plugin = async ({ directory }) => {
+  const workerSessions = new Map<string, AgencyContext>()
+
+  return {
+    config: async (config) => {
+      const context = await agencyContext(directory).catch(() => undefined)
+      const root = process.env.AGENCY_WORKBASE ?? context?.root ?? discoverWorkbase(directory)
+      const checkout = process.env.AGENCY_WRITABLE_CHECKOUT ?? context?.checkout ?? discoverCheckout(directory, root)
+
+      const reference = config.references?.workbase
+      if (
+        root &&
+        typeof reference === "object" &&
+        reference.path === ".." &&
+        reference.description ===
+          "Complete Agency workbase context; write authority still comes only from agency context" &&
+        typeof config.permission !== "string"
+      ) {
+        config.permission ??= {}
+        const external = config.permission.external_directory
+        if (external === undefined) {
+          config.permission.external_directory = { [join(root, "*")]: "allow" }
+        } else if (typeof external === "object") {
+          config.permission.external_directory = {
+            [join(root, "*")]: "allow",
+            ...external,
+          }
         }
       }
-    }
 
-    if (!checkout) return
-
-    const paths = [
-      join(checkout, ".claude", "skills"),
-      join(checkout, ".agents", "skills"),
-      join(checkout, ".opencode", "skill"),
-      join(checkout, ".opencode", "skills"),
-    ].filter(existsSync).map((path) => \`\${path}\${sep}.\`)
-    if (paths.length === 0) return
-
-    config.skills ??= {}
-    config.skills.paths = [...new Set([...(config.skills.paths ?? []), ...paths])]
-  },
-})
+      if (!checkout) return
+
+      const paths = [
+        join(checkout, ".claude", "skills"),
+        join(checkout, ".agents", "skills"),
+        join(checkout, ".opencode", "skill"),
+        join(checkout, ".opencode", "skills"),
+      ].filter(existsSync).map((path) => \`\${path}\${sep}.\`)
+      if (paths.length === 0) return
+
+      config.skills ??= {}
+      config.skills.paths = [...new Set([...(config.skills.paths ?? []), ...paths])]
+    },
+    "chat.message": async ({ sessionID }, output) => {
+      const launchTarget = workerLaunchTarget(output.parts)
+      if (!launchTarget) return
+      const context = await agencyContext(directory, false).catch(() => undefined)
+      if (context?.target !== launchTarget) return
+      workerSessions.set(sessionID, context)
+    },
+    "experimental.chat.system.transform": async ({ sessionID }, output) => {
+      if (!sessionID) return
+      const context = workerSessions.get(sessionID)
+      if (!context?.target) return
+      output.system.push(
+        \`Agency verified this OpenCode session as the active worker for \${context.target}. Perform the assigned work directly. Do not invoke agency work for this target or launch a replacement worker.\`,
+      )
+    },
+    "shell.env": async ({ sessionID }, output) => {
+      if (!sessionID) return
+      const context = workerSessions.get(sessionID)
+      if (!context?.target) return
+      output.env.AGENCY_SESSION_ID = sessionID
+      output.env.AGENCY_TARGET = context.target
+      if (context.root) output.env.AGENCY_WORKBASE = context.root
+      if (context.checkout) output.env.AGENCY_WRITABLE_CHECKOUT = context.checkout
+      if (context.task) output.env.AGENCY_TASK_ID = context.task
+      if (context.phase) output.env.AGENCY_PHASE_ID = context.phase
+    },
+  }
+}
 
 export default plugin
 `

package/src/workbase/runner-command.test.ts

@@ -95,9 +95,12 @@ describe("runner commands", () => {
 		expect(environment).toMatchObject({
 			AGENCY_RUNNER: "custom",
 			AGENCY_CLAIMANT: "orchestrator",
+			AGENCY_SESSION_ID: "session-1",
+			AGENCY_WORKBASE: "/workbase",
 			AGENCY_TARGET: "execution-unit:phase/task/build",
 			AGENCY_TASK_ID: "task",
 			AGENCY_PHASE_ID: "build",
+			AGENCY_PROMPT: "Read the task.",
 		})
 		expect(printableEnvironment(environment).VISIBLE).toBe("yes")
 		expect(printableEnvironment(environment).ACCESS_TOKEN).toBeUndefined()