@zhijiewang/openharness 2.16.0 → 2.17.0

package/dist/harness/config.d.ts

@@ -152,6 +152,13 @@ export type OhConfig = {
 };
 /** Clear cached config (call after writes or to force re-read) */
 export declare function invalidateConfigCache(): void;
-export declare function readOhConfig(root?: string): OhConfig | null;
+export type SettingSource = "user" | "project" | "local";
+export declare function readOhConfig(root?: string, sources?: readonly SettingSource[]): OhConfig | null;
+/**
+ * Parse the `--setting-sources` CLI flag (comma-separated source names).
+ * Returns `undefined` when the flag is absent or empty (caller uses defaults).
+ * Unknown names are silently dropped.
+ */
+export declare function parseSettingSources(raw: string | undefined): SettingSource[] | undefined;
 export declare function writeOhConfig(cfg: OhConfig, root?: string): void;
 //# sourceMappingURL=config.d.ts.map

package/dist/harness/config.js

@@ -34,50 +34,72 @@ function readGlobalConfig() {
         return null;
     }
 }
-export function readOhConfig(root) {
+const ALL_SOURCES = ["user", "project", "local"];
+export function readOhConfig(root, sources) {
     const effectiveRoot = root ?? ".";
-    if (_configCache !== undefined && _configCacheRoot === effectiveRoot)
+    // Only cache when merging the full default set. Callers that pass a subset
+    // are expressing a request-scoped intent and shouldn't poison the cache.
+    const usingDefaults = sources === undefined;
+    if (usingDefaults && _configCache !== undefined && _configCacheRoot === effectiveRoot)
         return _configCache;
-    const p = configPath(root);
-    // Layer 1: Global defaults from ~/.oh/config.yaml
-    const globalCfg = readGlobalConfig();
-    // Layer 2: Project config from .oh/config.yaml
+    const enabled = new Set(sources ?? ALL_SOURCES);
+    // Layer 1: Global defaults from ~/.oh/config.yaml (source: "user")
+    const globalCfg = enabled.has("user") ? readGlobalConfig() : null;
+    // Layer 2: Project config from .oh/config.yaml (source: "project")
     let projectCfg = null;
-    if (existsSync(p)) {
-        try {
-            projectCfg = parse(readFileSync(p, "utf-8"));
-        }
-        catch {
-            /* ignore malformed project config */
+    if (enabled.has("project")) {
+        const p = configPath(root);
+        if (existsSync(p)) {
+            try {
+                projectCfg = parse(readFileSync(p, "utf-8"));
+            }
+            catch {
+                /* ignore malformed project config */
+            }
         }
     }
-    // If neither exists, no config
-    if (!globalCfg && !projectCfg) {
-        _configCache = null;
-        _configCacheRoot = effectiveRoot;
-        return null;
-    }
-    // Merge: global → project (project overrides global)
-    const base = { ...globalCfg, ...projectCfg };
-    // Layer 3: Local overrides from .oh/config.local.yaml (gitignored personal settings)
-    const localPath = join(root ?? ".", ".oh", "config.local.yaml");
-    if (existsSync(localPath)) {
-        try {
-            const local = parse(readFileSync(localPath, "utf-8"));
-            if (local) {
-                const merged = { ...base, ...local };
-                _configCache = merged;
-                _configCacheRoot = effectiveRoot;
-                return merged;
+    // Layer 3: Local overrides from .oh/config.local.yaml (source: "local")
+    let localCfg = null;
+    if (enabled.has("local")) {
+        const localPath = join(root ?? ".", ".oh", "config.local.yaml");
+        if (existsSync(localPath)) {
+            try {
+                localCfg = parse(readFileSync(localPath, "utf-8"));
+            }
+            catch {
+                /* ignore malformed local config */
             }
         }
-        catch {
-            /* ignore malformed local config */
+    }
+    if (!globalCfg && !projectCfg && !localCfg) {
+        if (usingDefaults) {
+            _configCache = null;
+            _configCacheRoot = effectiveRoot;
         }
+        return null;
+    }
+    // Precedence: local > project > user
+    const merged = { ...(globalCfg ?? {}), ...(projectCfg ?? {}), ...(localCfg ?? {}) };
+    if (usingDefaults) {
+        _configCache = merged;
+        _configCacheRoot = effectiveRoot;
     }
-    _configCache = base;
-    _configCacheRoot = effectiveRoot;
-    return base;
+    return merged;
+}
+/**
+ * Parse the `--setting-sources` CLI flag (comma-separated source names).
+ * Returns `undefined` when the flag is absent or empty (caller uses defaults).
+ * Unknown names are silently dropped.
+ */
+export function parseSettingSources(raw) {
+    if (!raw)
+        return undefined;
+    const valid = new Set(["user", "project", "local"]);
+    const out = raw
+        .split(",")
+        .map((s) => s.trim())
+        .filter((s) => valid.has(s));
+    return out.length > 0 ? out : undefined;
 }
 export function writeOhConfig(cfg, root) {
     invalidateConfigCache();

package/dist/main.js

@@ -15,7 +15,7 @@ import { homedir } from "node:os";
 import { join } from "node:path";
 import { Command, Option } from "commander";
 import { render } from "ink";
-import { readOhConfig } from "./harness/config.js";
+import { parseSettingSources, readOhConfig } from "./harness/config.js";
 import { emitHook, setHookDecisionObserver } from "./harness/hooks.js";
 import { loadActiveMemories, memoriesToPrompt, userProfileToPrompt } from "./harness/memory.js";
 import { detectProject, projectContextToPrompt } from "./harness/onboarding.js";
@@ -120,6 +120,8 @@ program
     .option("--append-system-prompt <text>", "Append text to the system prompt")
     .option("--allowed-tools <tools>", "Comma-separated list of allowed tools")
     .option("--disallowed-tools <tools>", "Comma-separated list of disallowed tools")
+    .option("--resume <id>", "Resume a saved session (replays its message history before this prompt)")
+    .option("--setting-sources <sources>", "Comma-separated list of setting sources to merge (e.g. 'user,project,local'). Mirrors Claude Code's setting_sources.")
     .action(async (promptArg, opts) => {
     // Read from stdin if prompt is "-" or omitted and stdin is not a TTY
     let prompt;
@@ -137,7 +139,8 @@ program
     else {
         prompt = promptArg;
     }
-    const savedConfig = readOhConfig();
+    const settingSources = parseSettingSources(opts.settingSources);
+    const savedConfig = readOhConfig(undefined, settingSources);
     const permissionMode = (opts.trust
         ? "trust"
         : opts.deny
@@ -189,7 +192,30 @@ program
     let fullOutput = "";
     const toolResults = [];
     const callIdToName = {};
+    // Resume a saved session if --resume <id> was passed. Replays its message
+    // history into the conversation before the new prompt. If the session can't
+    // be loaded (missing file, malformed JSON), fail early with a clear error
+    // rather than silently starting fresh.
+    let priorMessages;
+    let sessionId;
+    if (opts.resume) {
+        const { loadSession } = await import("./harness/session.js");
+        try {
+            const src = loadSession(opts.resume);
+            priorMessages = src.messages;
+            sessionId = src.id;
+        }
+        catch {
+            process.stderr.write(`Error: could not load session '${opts.resume}'\n`);
+            process.exit(1);
+        }
+    }
     if (outputFormat === "stream-json") {
+        // Emit a session_start event so SDK callers can capture the id for
+        // later resume (fires once, before turnStart).
+        if (sessionId) {
+            console.log(JSON.stringify({ type: "session_start", sessionId }));
+        }
         setHookDecisionObserver((n) => {
             console.log(JSON.stringify({
                 type: "hook_decision",
@@ -209,7 +235,7 @@ program
     if (outputFormat === "stream-json") {
         console.log(JSON.stringify({ type: "turnStart", turnNumber: 0 }));
     }
-    for await (const event of query(prompt, config)) {
+    for await (const event of query(prompt, config, priorMessages)) {
         if (event.type === "text_delta") {
             fullOutput += event.content;
             if (outputFormat === "text")
@@ -293,8 +319,11 @@ program
     .option("--disallowed-tools <tools>", "Comma-separated disallowed tool names")
     .option("--max-turns <n>", "Maximum turns per prompt", "20")
     .option("--system-prompt <prompt>", "Override the system prompt")
+    .option("--resume <id>", "Resume a saved session (seeds the conversation with its prior message history)")
+    .option("--setting-sources <sources>", "Comma-separated list of setting sources to merge (mirrors Claude Code's setting_sources).")
     .action(async (opts) => {
-    const savedConfig = readOhConfig();
+    const settingSources = parseSettingSources(opts.settingSources);
+    const savedConfig = readOhConfig(undefined, settingSources);
     const permissionMode = (opts.permissionMode ??
         savedConfig?.permissionMode ??
         "trust");
@@ -327,7 +356,21 @@ program
         model,
     };
     // Conversation history, shared across all prompts for this process.
+    // Seeded from a prior session when --resume <id> is passed.
     const conversation = [];
+    let sessionId;
+    if (opts.resume) {
+        const { loadSession } = await import("./harness/session.js");
+        try {
+            const src = loadSession(opts.resume);
+            conversation.push(...src.messages);
+            sessionId = src.id;
+        }
+        catch {
+            console.log(JSON.stringify({ type: "error", message: `could not load session '${opts.resume}'` }));
+            return;
+        }
+    }
     let turnCounter = 0;
     // Will be set to the current prompt id before each turn so hook_decision
     // events can be demultiplexed by the client.
@@ -343,7 +386,7 @@ program
         }));
     });
     // Announce readiness so the client can send the first prompt.
-    console.log(JSON.stringify({ type: "ready" }));
+    console.log(JSON.stringify({ type: "ready", sessionId }));
     const readline = await import("node:readline");
     const rl = readline.createInterface({ input: process.stdin, crlfDelay: Infinity });
     for await (const rawLine of rl) {

package/dist/tools/MemoryTool/index.d.ts

@@ -11,7 +11,7 @@ declare const inputSchema: z.ZodObject<{
 }, "strip", z.ZodTypeAny, {
     action: "search" | "save" | "list";
     content?: string | undefined;
-    type?: "user" | "convention" | "preference" | "project" | "debugging" | "feedback" | "reference" | undefined;
+    type?: "user" | "project" | "convention" | "preference" | "debugging" | "feedback" | "reference" | undefined;
     name?: string | undefined;
     description?: string | undefined;
     global?: boolean | undefined;
@@ -19,7 +19,7 @@ declare const inputSchema: z.ZodObject<{
 }, {
     action: "search" | "save" | "list";
     content?: string | undefined;
-    type?: "user" | "convention" | "preference" | "project" | "debugging" | "feedback" | "reference" | undefined;
+    type?: "user" | "project" | "convention" | "preference" | "debugging" | "feedback" | "reference" | undefined;
     name?: string | undefined;
     description?: string | undefined;
     global?: boolean | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhijiewang/openharness",
-  "version": "2.16.0",
+  "version": "2.17.0",
   "description": "Open-source terminal coding agent. Works with any LLM.",
   "type": "module",
   "bin": {