@herbertgao/pi-subagents 0.18.5 → 0.22.0-local.1

package/src/workflow/json-schema.ts

@@ -7,14 +7,15 @@
  *
  * ## Which typebox
  *
- * **`typebox`, not `@sinclair/typebox`.** They are different packages and both
- * are installed here. `@sinclair/typebox` (0.34) dispatches on a `Kind` symbol
- * that a schema arriving over the wire does not carry, so `Value.Check` throws
- * `Unknown type` on a plain JSON Schema — and `Type.Unsafe` does not help, it
- * stamps a `Kind` that is not registered. `typebox` v1 is a standards JSON
- * Schema validator and takes the schema as-is. It is also the package pi itself
- * types `ToolDefinition.parameters` against, so the same schema object serves
- * both roles with no conversion.
+ * **`typebox`, not `@sinclair/typebox`.** They are different packages.
+ * `@sinclair/typebox` (0.34) dispatches on a `Kind` symbol that a schema
+ * arriving over the wire does not carry, so `Value.Check` throws `Unknown type`
+ * on a plain JSON Schema — and `Type.Unsafe` does not help, it stamps a `Kind`
+ * that is not registered. `typebox` v1 is a standards JSON Schema validator and
+ * takes the schema as-is. It is also the package pi itself types
+ * `ToolDefinition.parameters` against and supplies to extensions at runtime
+ * (a peer dependency here), so the same schema object serves both roles with no
+ * conversion.
  *
  * ## Why we validate at all
  *

package/src/workflow/saved.ts

@@ -41,18 +41,36 @@ import { existsSync, readdirSync, readFileSync, statSync } from "node:fs"
 import { isAbsolute, join } from "node:path"
 import { getAgentDir } from "@earendil-works/pi-coding-agent"
 import { isSymlink, isUnsafeName, safeReadFile } from "../memory.js"
+import {
+  isPackageResourceExcluded,
+  packageWorkflowDirs,
+  packageWorkflowFiles,
+} from "../package-resources.js"
 import { hasMetaDeclaration } from "./meta.js"
 import { MAX_SCRIPT_LENGTH } from "./runtime.js"
 
 /** Extension a saved workflow file carries. */
 const WORKFLOW_EXTENSION = ".js"
 
-/** The roots a `name` is looked up in, highest priority first. */
+/**
+ * The roots a `name` is looked up in, highest priority first.
+ *
+ * Directories declared by installed pi packages come last, so a project, shared
+ * workspace or personal script always wins the name. That is the same tier
+ * package-provided agents get, and the same tier pi gives package-provided
+ * skills — a package offers a workflow, it never takes a name away from you.
+ *
+ * The `packageWorkflows` gate and pi's project-trust answer are session state in
+ * package-resources.ts rather than parameters here, so a gate set in `/agents`
+ * reaches this without an options bag travelling through `resolveWorkflowScript`,
+ * `resolveWorkflowSource` and `readSavedWorkflow` purely to be consulted once.
+ */
 export function savedWorkflowRoots(cwd: string): string[] {
   return [
     join(cwd, ".pi", "workflows"),
     join(cwd, ".agents", "workflows"),
     join(getAgentDir(), "workflows"),
+    ...packageWorkflowDirs(cwd),
   ]
 }
 
@@ -82,6 +100,9 @@ export function readSavedWorkflow(name: string, cwd: string): SavedWorkflow {
   for (const root of roots) {
     if (isSymlink(root)) continue // reject a symlinked root entirely, as skill-loader does
     const path = join(root, `${trimmed}${WORKFLOW_EXTENSION}`)
+    // A `!` entry in the declaring package's manifest. Only ever true for a path
+    // under a package root, so the local roots pay one set lookup for it.
+    if (isPackageResourceExcluded(path, cwd, "workflows")) continue
     const script = safeReadFile(path)
     if (script === undefined) continue
     // Found the file, so stop looking — a shadowing name that turns out not to
@@ -97,6 +118,25 @@ export function readSavedWorkflow(name: string, cwd: string): SavedWorkflow {
     return { ok: true, script, path }
   }
 
+  // Last: a package that declared an individual file rather than a directory.
+  // It carries no root to look a name up in, so it is matched by name here
+  // instead — after every root, which keeps package scripts lowest-precedence.
+  const declared = packageWorkflowFiles(cwd).get(trimmed)
+  if (declared !== undefined) {
+    const script = safeReadFile(declared)
+    if (script !== undefined) {
+      if (!hasMetaDeclaration(script)) {
+        return {
+          ok: false,
+          message:
+            `"${declared}" is not a workflow script — it has no \`export const meta = { name, description }\` ` +
+            "declaration. Nothing was run.",
+        }
+      }
+      return { ok: true, script, path: declared }
+    }
+  }
+
   const known = listSavedWorkflows(cwd)
   return {
     ok: false,
@@ -158,9 +198,15 @@ export function listSavedWorkflows(cwd: string): string[] {
       if (!entry.endsWith(WORKFLOW_EXTENSION)) continue
       const name = entry.slice(0, -WORKFLOW_EXTENSION.length)
       if (isUnsafeName(name)) continue
-      if (isWorkflowFile(join(root, entry))) names.add(name)
+      const path = join(root, entry)
+      if (isPackageResourceExcluded(path, cwd, "workflows")) continue
+      if (isWorkflowFile(path)) names.add(name)
     }
   }
+  for (const [name, path] of packageWorkflowFiles(cwd)) {
+    if (isUnsafeName(name)) continue
+    if (isWorkflowFile(path)) names.add(name)
+  }
   return [...names].sort()
 }