orcastrator 0.2.13 → 0.2.14

package/README.md

@@ -188,7 +188,7 @@ Global:
 
 - `--anthropic-key <key>`
 - `--openai-key <key>`
-- `--check` (API key lookup order: CLI flag → process env → `~/.openclaw/openclaw.json` `env.vars` → `~/.claude/.env` → `~/.config/claude/.env` → `./.env`)
+- `--check` (API key lookup order: CLI flag → process env → `~/.openclaw/openclaw.json` `env.vars` → `~/.claude/.env` → `~/.config/claude/.env`)
 - `--global`
 - `--project`
 

package/dist/cli/commands/setup.js

@@ -57,7 +57,7 @@ export function resolveApiKey(flagValue, envVarName, openclawConfigPathOrOptions
         return envValue.trim();
     }
     const options = typeof openclawConfigPathOrOptions === "string"
-        ? { ...(maybeOptions ?? {}), openclawConfigPath: openclawConfigPathOrOptions }
+        ? { ...maybeOptions, openclawConfigPath: openclawConfigPathOrOptions }
         : (openclawConfigPathOrOptions ?? {});
     const homedir = options.homedir ?? os.homedir();
     const openclawValue = readOpenclawEnvVar(envVarName, options.openclawConfigPath, homedir);
@@ -65,7 +65,6 @@ export function resolveApiKey(flagValue, envVarName, openclawConfigPathOrOptions
         return openclawValue;
     }
     const dotenvValue = readDotEnvFallback(envVarName, {
-        cwd: options.cwd ?? process.cwd(),
         homedir
     });
     if (dotenvValue) {
@@ -104,8 +103,7 @@ function readOpenclawEnvVar(envVarName, openclawConfigPath, homedir = os.homedir
 function readDotEnvFallback(envVarName, options) {
     const candidatePaths = [
         path.join(options.homedir, ".claude", ".env"),
-        path.join(options.homedir, ".config", "claude", ".env"),
-        path.join(options.cwd, ".env")
+        path.join(options.homedir, ".config", "claude", ".env")
     ];
     for (const candidatePath of candidatePaths) {
         const value = readEnvVarFromDotEnvFile(candidatePath, envVarName);

package/dist/core/planner.js

@@ -1,10 +1,13 @@
 import { promises as fs } from "node:fs";
+import path from "node:path";
 import { planSpec as planSpecWithClaude } from "../agents/claude/session.js";
 import { planSpec as planSpecWithCodex } from "../agents/codex/session.js";
 import { logger } from "../utils/logger.js";
 import { loadSkills } from "../utils/skill-loader.js";
 import { validateDAG } from "./dependency-graph.js";
 const DEFAULT_SYSTEM_CONTEXT = "You are Orca planner.";
+const PROJECT_INSTRUCTION_FILES = ["AGENTS.md", "CLAUDE.md"];
+const PROJECT_INSTRUCTION_CHAR_CAP = 4_000;
 let testPlanSpecOverride = null;
 export function setPlanSpecForTests(fn) {
     testPlanSpecOverride = fn;
@@ -26,12 +29,77 @@ function formatSkillsSection(skills) {
     ].join("\n"));
     return ["## Available Skills", "", ...formattedSkills].join("\n");
 }
+async function pathExists(targetPath) {
+    try {
+        await fs.access(targetPath);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+async function resolveProjectContextDir(specPath) {
+    let currentDir = path.dirname(path.resolve(specPath));
+    while (true) {
+        const gitMarker = path.join(currentDir, ".git");
+        if (await pathExists(gitMarker)) {
+            return currentDir;
+        }
+        const parent = path.dirname(currentDir);
+        if (parent === currentDir) {
+            return path.dirname(path.resolve(specPath));
+        }
+        currentDir = parent;
+    }
+}
+async function loadProjectInstructions(specPath) {
+    const projectDir = await resolveProjectContextDir(specPath);
+    const instructions = [];
+    for (const fileName of PROJECT_INSTRUCTION_FILES) {
+        const filePath = path.join(projectDir, fileName);
+        if (!(await pathExists(filePath))) {
+            continue;
+        }
+        const rawContent = await fs.readFile(filePath, "utf8");
+        const content = rawContent.slice(0, PROJECT_INSTRUCTION_CHAR_CAP);
+        instructions.push({
+            fileName,
+            filePath,
+            content,
+            truncated: rawContent.length > PROJECT_INSTRUCTION_CHAR_CAP
+        });
+    }
+    return instructions;
+}
+function formatProjectInstructionsSection(instructions) {
+    const parts = ["## Project Instructions"];
+    for (const instruction of instructions) {
+        parts.push("");
+        parts.push(`### ${instruction.fileName} (${instruction.filePath})`);
+        parts.push("");
+        parts.push("```md");
+        parts.push(instruction.content);
+        parts.push("```");
+        if (instruction.truncated) {
+            parts.push(`(truncated to ${PROJECT_INSTRUCTION_CHAR_CAP} characters)`);
+        }
+    }
+    return parts.join("\n");
+}
+function buildSystemContext(skills, instructions) {
+    const sections = [DEFAULT_SYSTEM_CONTEXT];
+    if (instructions.length > 0) {
+        sections.push(formatProjectInstructionsSection(instructions));
+    }
+    if (skills.length > 0) {
+        sections.push(formatSkillsSection(skills));
+    }
+    return sections.join("\n\n");
+}
 export async function runPlanner(specPath, store, runId, config) {
     const spec = await fs.readFile(specPath, "utf8");
-    const skills = await loadSkills(config);
-    const systemContext = skills.length === 0
-        ? DEFAULT_SYSTEM_CONTEXT
-        : `${DEFAULT_SYSTEM_CONTEXT}\n\n${formatSkillsSection(skills)}`;
+    const [skills, instructions] = await Promise.all([loadSkills(config), loadProjectInstructions(specPath)]);
+    const systemContext = buildSystemContext(skills, instructions);
     const planSpecImpl = resolvePlanSpecImpl(config);
     const result = await planSpecImpl(spec, systemContext, config);
     validateDAG(result.tasks);

package/dist/hooks/adapters/stdout.js

@@ -1,4 +1,4 @@
-export function createStdoutHookHandler(prefix = "[hook]") {
+export function createStdoutHookHandler(prefix = "[hook]", write = console.log) {
     return async (event) => {
         const line = {
             prefix,
@@ -10,6 +10,6 @@ export function createStdoutHookHandler(prefix = "[hook]") {
             error: event.error,
             metadata: event.metadata
         };
-        console.log(JSON.stringify(line));
+        write(JSON.stringify(line));
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orcastrator",
-  "version": "0.2.13",
+  "version": "0.2.14",
   "type": "module",
   "bin": {
     "orca": "dist/cli/index.js"
@@ -10,7 +10,7 @@
     "dev": "bun run src/cli/index.ts",
     "lint": "oxlint src/",
     "typecheck": "tsc --noEmit",
-    "test": "bun test",
+    "test": "bun test src",
     "start": "bun run src/cli/index.ts",
     "prepare": "husky",
     "postbuild": "chmod +x dist/cli/index.js"
@@ -21,7 +21,7 @@
     "@ratley/codex-client": "^0.1.3",
     "chalk": "^5.3.0",
     "commander": "^13.1.0",
-    "zod": "^3.24.1"
+    "zod": "^4.3.6"
   },
   "devDependencies": {
     "@types/bun": "^1.2.21",