@atolis-hq/wake 0.2.1 → 0.2.2

package/README.md

@@ -97,7 +97,7 @@ For more detail, see [docs/vision.md](docs/vision.md) and
   log; projections can be rebuilt, and the loop can crash and resume without
   losing its place.
 - **Local and inspectable.** Everything lives in a plain-file Wake home
-  directory: `config.json`, `prompts/`, and `workspaces/` at the top level for
+  directory: `config.yaml`, `config.workflows.yaml`, `prompts/`, and `workspaces/` at the top level for
   what you edit or browse day-to-day, with durable/internal state (events,
   projections, runs, logs, sandbox auth) nested under a hidden `.wake/`.
 - **Sandbox-oriented execution.** Wake can run from a persistent Docker sandbox
@@ -169,7 +169,7 @@ any time for the full command list, or see
 - [docs/architecture.md](docs/architecture.md) — module boundaries and the event-sourced core.
 - [docs/workflows.md](docs/workflows.md) — how stages, prompts, and runner routes are configured.
 - [docs/prompts.md](docs/prompts.md) — how prompt templates map to workflow stages.
-- [docs/configuration.md](docs/configuration.md) — `config.json` options and the operator correlation escape hatch.
+- [docs/configuration.md](docs/configuration.md) — `config.yaml`/`config.workflows.yaml` options and the operator correlation escape hatch.
 - [docs/development.md](docs/development.md) — source-checkout dev setup (`wake-dev`), npm scripts, formatting, self-update, GitHub polling.
 - [docs/runner-comparison.md](docs/runner-comparison.md) — capability differences between supported runners.
 

package/dist/src/adapters/fs/state-store.js

@@ -1,6 +1,6 @@
 import { access, appendFile, mkdir, readFile, readdir, rename } from 'node:fs/promises';
 import { dirname, join } from 'node:path';
-import { parseEventEnvelope, parseIssueStateRecord, parseLedger, parseRunRecord, parseSourceStateRecord, parseWakeConfig, } from '../../domain/schema.js';
+import { parseEventEnvelope, parseIssueStateRecord, parseLedger, parseRunRecord, parseSourceStateRecord, } from '../../domain/schema.js';
 import { isTerminalStage } from '../../domain/stages.js';
 import { appendJsonLine, readJsonFile, writeJsonFile } from '../../lib/json-file.js';
 import { createWakePaths } from '../../lib/paths.js';
@@ -144,11 +144,6 @@ export function createStateStore({ wakeRoot }) {
         async ensureWakeRoot() {
             await mkdir(wakeRoot, { recursive: true });
         },
-        async writeConfig(record) {
-            const parsed = parseWakeConfig(record);
-            await writeJsonFile(paths.configFile, parsed);
-            return parsed;
-        },
         async writeLedger(record) {
             const parsed = parseLedger(record);
             await writeJsonFile(paths.ledgerFile, parsed);

package/dist/src/cli/scaffold-assets.js

@@ -1,7 +1,8 @@
 import { access, chmod, copyFile, mkdir, readFile, readdir, writeFile } from 'node:fs/promises';
 import { basename, dirname, join, resolve } from 'node:path';
 import { createDefaultWakeConfig } from '../config/defaults.js';
-import { writeJsonFile } from '../lib/json-file.js';
+import { splitWakeConfig } from '../config/split-config.js';
+import { writeYamlFile } from '../lib/yaml-file.js';
 import { createWakePaths } from '../lib/paths.js';
 const promptFileNames = ['refine.md', 'implement.md'];
 function sanitizeContainerName(name) {
@@ -85,8 +86,10 @@ export async function scaffoldWakeHome(input) {
         paths.workspaceRoot,
     ];
     await Promise.all(runtimeDirectories.map((directoryPath) => mkdir(directoryPath, { recursive: true })));
+    const { infra, workflow } = splitWakeConfig(config);
     await Promise.all([
         copyAssets(repoRoot, 'prompts', join(wakeRoot, 'prompts'), promptFileNames),
-        writeJsonFile(join(wakeRoot, 'config.json'), config),
+        writeYamlFile(join(wakeRoot, 'config.yaml'), infra),
+        writeYamlFile(join(wakeRoot, 'config.workflows.yaml'), workflow),
     ]);
 }

package/dist/src/config/discover-config-files.js

@@ -0,0 +1,11 @@
+import { readdir } from 'node:fs/promises';
+import { join } from 'node:path';
+const configFileNamePattern = /^config(\..+)?\.yaml$/;
+export async function discoverConfigFiles(wakeRoot) {
+    const entries = await readdir(wakeRoot, { withFileTypes: true }).catch(() => []);
+    return entries
+        .filter((entry) => entry.isFile() && configFileNamePattern.test(entry.name))
+        .map((entry) => entry.name)
+        .sort()
+        .map((name) => join(wakeRoot, name));
+}

package/dist/src/config/load-config.js

@@ -1,20 +1,47 @@
-import { resolve } from 'node:path';
+import { resolve, join } from 'node:path';
 import { access } from 'node:fs/promises';
 import { readJsonFile } from '../lib/json-file.js';
+import { readYamlFile } from '../lib/yaml-file.js';
+import { deepMergeRaw } from '../lib/deep-merge.js';
 import { parseWakeConfig } from '../domain/schema.js';
+import { discoverConfigFiles } from './discover-config-files.js';
+async function readLegacyConfigIfPresent(wakeRoot) {
+    const legacyConfigFile = join(wakeRoot, 'config.json');
+    try {
+        await access(legacyConfigFile);
+    }
+    catch {
+        return {};
+    }
+    return readJsonFile(legacyConfigFile);
+}
 export async function loadWakeConfig(options) {
     const wakeRoot = options?.wakeRoot ?? resolve(process.cwd(), '.wake');
-    const configFile = options?.configFile;
-    let raw = {};
-    if (configFile !== undefined) {
-        try {
-            await access(configFile);
-            raw = await readJsonFile(configFile);
-        }
-        catch {
-            // no config file — schema defaults apply
+    const configFiles = await discoverConfigFiles(wakeRoot);
+    let raw;
+    if (configFiles.length > 0) {
+        raw = {};
+        for (const configFile of configFiles) {
+            let parsed;
+            try {
+                // yaml.parse returns null for empty/comment-only files rather than
+                // {}, so coalesce before merging.
+                parsed = (await readYamlFile(configFile)) ?? {};
+            }
+            catch (error) {
+                throw new Error(`Failed to parse ${configFile}: ${error.message}`, {
+                    cause: error,
+                });
+            }
+            raw = deepMergeRaw(raw, parsed);
         }
     }
+    else {
+        // Pre-split Wake homes only have a single config.json — Wake reads it
+        // directly rather than requiring a migration step. It stays untouched
+        // on disk; nothing here writes it back out (see docs/configuration.md).
+        raw = await readLegacyConfigIfPresent(wakeRoot);
+    }
     // wakeRoot is always the live invocation's --wake-root/cwd, never a value
     // to accept from a (possibly stale, possibly container-context) config
     // file — spread rawPaths first so wakeRoot always wins. promptsRoot and

package/dist/src/config/split-config.js

@@ -0,0 +1,14 @@
+import { wakeInfraConfigSchema, wakeWorkflowConfigSchema } from '../domain/schema.js';
+const infraKeys = Object.keys(wakeInfraConfigSchema.shape);
+const workflowKeys = Object.keys(wakeWorkflowConfigSchema.shape);
+export function splitWakeConfig(config) {
+    const infra = {};
+    for (const key of infraKeys) {
+        infra[key] = config[key];
+    }
+    const workflow = {};
+    for (const key of workflowKeys) {
+        workflow[key] = config[key];
+    }
+    return { infra, workflow };
+}

package/dist/src/domain/schema.js

@@ -391,8 +391,7 @@ export const ledgerSchema = z.object({
     lastQuotaFailureAt: isoTimestampSchema.optional(),
     runners: z.record(z.string(), runnerHealthEntrySchema).default({}),
 });
-export const wakeConfigSchema = z
-    .object({
+const wakeConfigBaseSchema = z.object({
     schemaVersion: z.literal(1).default(1),
     paths: z.object({
         wakeRoot: z.string(),
@@ -649,8 +648,28 @@ export const wakeConfigSchema = z
         },
     }),
     sinks: z.record(z.string(), sinkEntrySchema).default({}),
-})
-    .superRefine((config, ctx) => {
+});
+export const wakeInfraConfigSchema = wakeConfigBaseSchema.pick({
+    schemaVersion: true,
+    paths: true,
+    sandbox: true,
+    dev: true,
+    scheduler: true,
+    transcripts: true,
+    ui: true,
+    sources: true,
+    sinks: true,
+});
+export const wakeWorkflowConfigSchema = wakeConfigBaseSchema.pick({
+    runners: true,
+    tiers: true,
+    defaultTier: true,
+    workflows: true,
+    workflowSelectors: true,
+    commands: true,
+    stages: true,
+});
+export const wakeConfigSchema = wakeConfigBaseSchema.superRefine((config, ctx) => {
     const promptsRoot = config.paths.promptsRoot ?? defaultPromptsRoot();
     const workflowEntries = Object.entries(config.workflows);
     const commandEntries = Object.entries(config.commands);

package/dist/src/lib/deep-merge.js

@@ -0,0 +1,14 @@
+function isPlainObject(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+export function deepMergeRaw(target, source) {
+    const result = { ...target };
+    for (const [key, sourceValue] of Object.entries(source)) {
+        const targetValue = result[key];
+        result[key] =
+            isPlainObject(sourceValue) && isPlainObject(targetValue)
+                ? deepMergeRaw(targetValue, sourceValue)
+                : sourceValue;
+    }
+    return result;
+}

package/dist/src/lib/paths.js

@@ -11,7 +11,8 @@ export function createWakePaths(wakeRoot) {
         wakeRoot,
         dataRoot,
         containerHomeRoot: join(dataRoot, 'container-home'),
-        configFile: join(wakeRoot, 'config.json'),
+        configFile: join(wakeRoot, 'config.yaml'),
+        workflowsConfigFile: join(wakeRoot, 'config.workflows.yaml'),
         ledgerFile: join(dataRoot, 'ledger.json'),
         pauseFile: join(dataRoot, 'PAUSE'),
         tickRequestFile: join(dataRoot, 'control', 'tick-request.json'),

package/dist/src/lib/yaml-file.js

@@ -0,0 +1,20 @@
+import { mkdir, readFile, rename, rm, writeFile } from 'node:fs/promises';
+import { randomUUID } from 'node:crypto';
+import { dirname } from 'node:path';
+import { parse, stringify } from 'yaml';
+export async function writeYamlFile(path, value) {
+    await mkdir(dirname(path), { recursive: true });
+    const tempPath = `${path}.${randomUUID()}.tmp`;
+    try {
+        await writeFile(tempPath, stringify(value), 'utf8');
+        await rename(tempPath, path);
+    }
+    catch (error) {
+        await rm(tempPath, { force: true }).catch(() => { });
+        throw error;
+    }
+}
+export async function readYamlFile(path) {
+    const raw = await readFile(path, 'utf8');
+    return parse(raw);
+}

package/dist/src/main.js

@@ -441,9 +441,7 @@ export async function buildRuntime(args) {
     await stateStore.ensureWakeRoot();
     const config = await loadWakeConfig({
         wakeRoot,
-        configFile: stateStore.paths.configFile,
     });
-    await stateStore.writeConfig(config);
     const resourceIndex = createResourceIndex({ paths: stateStore.paths });
     const prTrackingEnabled = config.sources.github.enabled && config.sources.github.pullRequests.enabled;
     // Resolved once and shared: resolveGitHubToken shells out to `gh auth
@@ -610,7 +608,6 @@ async function runUi(args) {
     await stateStore.ensureWakeRoot();
     const config = await loadWakeConfig({
         wakeRoot,
-        configFile: stateStore.paths.configFile,
     });
     const server = await runUiCommand({
         args,
@@ -659,7 +656,6 @@ async function runDoctor(args) {
     await stateStore.ensureWakeRoot();
     const config = await loadWakeConfig({
         wakeRoot,
-        configFile: stateStore.paths.configFile,
     });
     const docker = createHostDockerCli();
     const packageRoot = resolvePackageRoot();
@@ -811,7 +807,6 @@ async function main() {
         await stateStore.ensureWakeRoot();
         const config = await loadWakeConfig({
             wakeRoot,
-            configFile: stateStore.paths.configFile,
         });
         const docker = createHostDockerCli();
         const repoRoot = config.dev?.repoRoot;
@@ -928,7 +923,6 @@ async function main() {
             await stateStore.ensureWakeRoot();
             const config = await loadWakeConfig({
                 wakeRoot,
-                configFile: stateStore.paths.configFile,
             });
             const wakeInvocation = config.dev?.mode === 'source' ? ['node', '/app/dist/src/main.js'] : ['wake'];
             await runSandbox(['exec', '--', ...wakeInvocation, ...rewritten]);

package/dist/src/version.js

@@ -1 +1 @@
-export const wakeVersion = "0.2.1+g4279d3f";
+export const wakeVersion = "0.2.2+g83e9f9a";

package/docker/log-command.sh

@@ -87,7 +87,7 @@ prepare_codex_home
 mirror_stdout "[${label}] begin ts=$(date -u +%FT%TZ) cwd=$(pwd) command=$*"
 mirror_stdout "[${label}] paths hostWakeRoot=${host_wake_root} containerWakeRoot=${container_wake_root} promptsRoot=${prompts_root} containerHome=${container_home} hostContainerHome=${host_container_home} containerMount=${container_mount} containerName=${container_name}"
 
-emit_check "wake-config" test -f "${container_mount}/config.json"
+emit_check "wake-config" test -f "${container_mount}/config.yaml" -o -f "${container_mount}/config.json"
 emit_check "prompts-root" test -d "${prompts_root}"
 emit_check "workspaces-root" test -d "${container_mount}/workspaces"
 emit_check "repos-root" test -d "${container_mount}/repos"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atolis-hq/wake",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Local autonomous agent control plane for software development",
   "license": "Apache-2.0",
   "repository": {
@@ -48,6 +48,7 @@
     "@octokit/rest": "^22.0.0",
     "handlebars": "^4.7.9",
     "ulid": "^3.0.2",
+    "yaml": "^2.9.0",
     "zod": "^4.1.5"
   },
   "devDependencies": {