orcastrator 0.2.7 → 0.2.9

package/dist/agents/claude/session.js

@@ -50,7 +50,7 @@ function extractAssistantText(message) {
         .trim();
     return text.length > 0 ? text : null;
 }
-function parseTaskArray(raw) {
+export function parseTaskArray(raw) {
     const parsed = JSON.parse(raw);
     if (!Array.isArray(parsed)) {
         throw new Error("Claude plan response was not a JSON array");
@@ -63,11 +63,18 @@ function parseTaskArray(raw) {
         dependencies: Array.isArray(task.dependencies)
             ? task.dependencies.map(String)
             : [],
+        // Apply sensible defaults for required fields the LLM may have omitted.
+        name: typeof task.name === "string" && task.name.length > 0 ? task.name : "Unnamed task",
+        description: typeof task.description === "string" ? task.description : "",
+        acceptance_criteria: Array.isArray(task.acceptance_criteria) ? task.acceptance_criteria : [],
+        status: typeof task.status === "string" && task.status.length > 0 ? task.status : "pending",
+        retries: typeof task.retries === "number" ? task.retries : 0,
+        maxRetries: typeof task.maxRetries === "number" ? task.maxRetries : 3,
     }));
 }
-function parseTaskExecution(raw) {
+export function parseTaskExecution(raw) {
     const parsed = JSON.parse(raw);
-    if (!parsed || typeof parsed !== "object") {
+    if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
         throw new Error("Claude task response was not a JSON object");
     }
     const candidate = parsed;
@@ -112,9 +119,9 @@ async function collectSessionResult(session) {
 function getModel(config) {
     return config?.claude?.model ?? process.env.ORCA_CLAUDE_MODEL ?? "claude-sonnet-4-5";
 }
-export async function planSpec(spec, systemContext) {
+export async function planSpec(spec, systemContext, config) {
     const session = unstable_v2_createSession({
-        model: getModel()
+        model: getModel(config)
     });
     try {
         const streamPromise = collectSessionResult(session);

package/dist/agents/codex/session.js

@@ -26,9 +26,11 @@ function buildTaskExecutionPrompt(task, runId, cwd, systemContext) {
         "Acceptance Criteria:",
         ...task.acceptance_criteria.map((criterion, index) => `${index + 1}. ${criterion}`),
         "Execute this task. You have full shell access — run commands, read/write files, and do whatever is needed.",
-        "When done, output ONLY JSON on the last line:",
-        '{"outcome":"done"|"failed","error"?:"string"}',
-        "If you cannot complete the task, return outcome=failed with a short error reason.",
+        "IMPORTANT: When done, you MUST output the following JSON on its own line as the very last line of your response (no trailing text after it):",
+        '{"outcome":"done"}',
+        "Or if the task failed:",
+        '{"outcome":"failed","error":"short reason"}',
+        "Do not wrap it in markdown fences. Do not add any text after the JSON line. The JSON line is required.",
     ].join("\n\n");
 }
 function extractAgentText(result) {
@@ -83,6 +85,21 @@ const POSITIVE_COMPLETION_PATTERNS = [
     /\bwritten\b/i,
     /\bcreated\b/i,
     /\bfinished\b/i,
+    // Additional patterns to catch natural-language Codex narration
+    /\bapplied\b/i,
+    /\bimplemented\b/i,
+    /\badded\b/i,
+    /\bupdated\b/i,
+    /\bmodified\b/i,
+    /\binstalled\b/i,
+    /\bfixed\b/i,
+    /\brefactored\b/i,
+    /\bchanges?\s+(?:have\s+been\s+)?made\b/i,
+    /\bthe\s+task\s+(?:has\s+been|is)\b/i,
+    /\bi\s+have\b/i,
+    /\ball\s+(?:tasks?|steps?|criteria)\b/i,
+    /\btest(?:s|ing)?\s+pass/i,
+    /\bno\s+(?:errors?|issues?|failures?)\b/i,
 ];
 const FAILURE_PATTERNS = [
     /\berror\b/i,
@@ -176,6 +193,22 @@ export async function createCodexSession(cwd, config) {
                 ],
             });
             const rawResponse = extractAgentText(result);
+            // Primary signal: use the SDK's structured turn status.
+            const status = result.turn.status;
+            if (status === "completed") {
+                return { outcome: "done", rawResponse };
+            }
+            if (status === "failed") {
+                return {
+                    outcome: "failed",
+                    error: result.turn.error?.message ?? "Turn failed",
+                    rawResponse,
+                };
+            }
+            if (status === "interrupted") {
+                return { outcome: "failed", error: "Turn was interrupted", rawResponse };
+            }
+            // Fallback: status is unexpected/missing — parse text as before.
             return parseTaskExecution(rawResponse);
         },
         async consultTaskGraph(tasks) {

package/dist/core/config-loader.js

@@ -49,6 +49,11 @@ function coerceConfig(candidate) {
             }
         }
     }
+    if ("executor" in candidate && candidate.executor !== undefined) {
+        if (candidate.executor !== "claude" && candidate.executor !== "codex") {
+            throw new Error(`Config.executor must be 'claude' or 'codex', got ${String(candidate.executor)}`);
+        }
+    }
     return candidate;
 }
 export async function loadConfig(configPath) {

package/dist/core/planner.js

@@ -24,7 +24,7 @@ export async function runPlanner(specPath, store, runId, config) {
     const systemContext = skills.length === 0
         ? DEFAULT_SYSTEM_CONTEXT
         : `${DEFAULT_SYSTEM_CONTEXT}\n\n${formatSkillsSection(skills)}`;
-    const result = await planSpecImpl(spec, systemContext);
+    const result = await planSpecImpl(spec, systemContext, config);
     validateDAG(result.tasks);
     await store.writeTasks(runId, result.tasks);
     await store.updateRun(runId, {

package/dist/core/task-runner.js

@@ -124,11 +124,11 @@ export async function runTaskRunner(options) {
             executeTaskFn = claudeAgent.executeTask;
         }
     }
-    let run = await store.getRun(runId);
-    if (!run) {
-        throw new Error(`Run not found: ${runId}`);
-    }
     try {
+        let run = await store.getRun(runId);
+        if (!run) {
+            throw new Error(`Run not found: ${runId}`);
+        }
         validateDAG(run.tasks);
         await emitHook({
             runId: run.runId,

package/dist/utils/skill-loader.js

@@ -59,7 +59,12 @@ export async function loadSkill(skillDirPath) {
         skillFileContent = await readFile(skillFilePath, "utf8");
     }
     catch (error) {
-        if (error.code === "ENOENT") {
+        const errorCode = error.code;
+        if (errorCode === "ENOENT") {
+            return null;
+        }
+        if (errorCode === "EACCES" || errorCode === "EPERM") {
+            console.warn(`Skipping skill at ${expandedDirPath}: unable to read SKILL.md (${errorCode})`);
             return null;
         }
         throw error;
@@ -87,13 +92,21 @@ export async function loadSkillsFromDir(skillsDirPath) {
         throw error;
     }
     const subdirectories = entries
-        .filter((entry) => entry.isDirectory())
+        .filter((entry) => {
+        if (entry.isSymbolicLink()) {
+            console.warn(`Skipping symlinked skill entry: ${path.join(expandedDirPath, entry.name)}`);
+            return false;
+        }
+        return entry.isDirectory();
+    })
         .map((entry) => entry.name)
         .sort((a, b) => a.localeCompare(b));
     const loaded = await Promise.all(subdirectories.map((subdirName) => loadSkill(path.join(expandedDirPath, subdirName))));
     return loaded.filter((skill) => skill !== null);
 }
 export async function loadSkills(config) {
+    // NOTE: config.skills paths are currently resolved relative to process.cwd().
+    // A future improvement can resolve them relative to the config file location.
     const fromConfig = await Promise.all((config?.skills ?? []).map((skillPath) => loadSkill(skillPath)));
     const projectSkills = await loadSkillsFromDir(path.join(process.cwd(), ".orca", "skills"));
     const globalSkills = await loadSkillsFromDir(path.join(os.homedir(), ".orca", "skills"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orcastrator",
-  "version": "0.2.7",
+  "version": "0.2.9",
   "type": "module",
   "bin": {
     "orca": "dist/cli/index.js"