@matterailab/orbcode 0.2.3 → 0.2.4

package/dist/core/agent.js

@@ -114,10 +114,13 @@ export class Agent {
         this.mcp = options.mcp;
         // Build the system prompt with AGENTS.md memory files and the skills
         // catalog injected, so the model sees project/user instructions and
-        // knows which skills it can invoke.
-        const memoryFiles = loadMemoryFiles(options.cwd);
-        const skills = loadSkills(options.cwd);
-        this.systemPrompt = buildSystemPrompt(options.cwd, { memoryFiles, skills });
+        // knows which skills it can invoke. An explicit override (from
+        // `orbcode -s <text>`) bypasses the default entirely.
+        const memoryFiles = options.systemPromptOverride ? [] : loadMemoryFiles(options.cwd);
+        const skills = options.systemPromptOverride ? new Map() : loadSkills(options.cwd);
+        this.systemPrompt = options.systemPromptOverride
+            ? options.systemPromptOverride
+            : buildSystemPrompt(options.cwd, { memoryFiles, skills });
         this.client = createLLMClient({
             token: options.token,
             modelId: options.modelId,
@@ -684,6 +687,9 @@ User time zone: ${timeZone}, UTC${timeZoneOffsetStr}`;
                     this.sessionApproveCommands = true;
             }
         }
+        // Yield so the UI can paint the "Working" indicator before a
+        // potentially long synchronous tool call blocks the event loop.
+        await new Promise(resolve => setImmediate(resolve));
         const result = await executeTool(toolCall.name, args, this.toolContext(), this.mcp);
         // PostToolUse can feed extra context (or a block reason) back to the
         // model. PreToolUse additionalContext is delivered here too.

package/dist/headless.js

@@ -3,7 +3,7 @@ import { getAuthToken, getPendingProjectHooks, loadSettings } from "./config/set
 import { Agent } from "./core/agent.js";
 import { McpManager } from "./mcp/manager.js";
 /** Non-interactive `orbcode -p "prompt"` mode: prints the final response to stdout. */
-export async function runHeadless(prompt, yolo) {
+export async function runHeadless(prompt, yolo, systemPromptOverride) {
     const settings = loadSettings();
     // An unknown --model (or MATTERAI_MODEL) silently resolves to the default; say
     // so on stderr instead of quietly running a different model than requested.
@@ -63,6 +63,7 @@ export async function runHeadless(prompt, yolo) {
         autoApproveSafeCommands: yolo,
         hooks: settings.hooks,
         mcp,
+        systemPromptOverride,
         callbacks: {
             onEvent: (event) => {
                 switch (event.type) {

package/dist/index.js

@@ -23,6 +23,9 @@ Usage:
   orbcode -p "…" --yolo   non-interactive with auto-approved edits/commands
   orbcode --model <id>    use a specific model for this run
   orbcode --resume <id>   resume a previous session by id
+  orbcode -s "<prompt>"   override the default system prompt (replaces it entirely;
+                          accepts -s <text>, --system-prompt <text>, and
+                          --system-prompt=<text> for values that start with '-')
   orbcode --version       print version
   orbcode --help          show this help
 `);
@@ -71,6 +74,33 @@ function takeFlagValue(args, name) {
     args.splice(index, 2);
     return value;
 }
+/**
+ * Pop the `-s` / `--system-prompt` flag (and its value) out of `args`.
+ * Unlike `takeFlagValue` this accepts a value that starts with `-`, because
+ * a system-prompt override is free-form text. Supports three forms:
+ *   -s "<text>"             --value in next arg
+ *   --system-prompt "<text>"
+ *   --system-prompt="<text>"
+ *   --system-prompt=-<text>
+ */
+function takeSystemPrompt(args) {
+    const longWithEq = args.findIndex((a) => a.startsWith("--system-prompt="));
+    if (longWithEq !== -1) {
+        const value = args[longWithEq].slice("--system-prompt=".length);
+        args.splice(longWithEq, 1);
+        return value.length > 0 ? value : undefined;
+    }
+    const index = args.findIndex((a) => a === "-s" || a === "--system-prompt");
+    if (index === -1)
+        return undefined;
+    const value = args[index + 1];
+    if (value === undefined) {
+        console.error("Missing value after -s / --system-prompt");
+        process.exit(1);
+    }
+    args.splice(index, 2);
+    return value;
+}
 async function main() {
     // Override Node's default process title so terminals (iTerm2 "current job
     // name", VSCode terminal status, etc.) don't append " (node)" next to our
@@ -110,6 +140,10 @@ async function main() {
             process.exit(1);
         }
     }
+    // `-s` / `--system-prompt` lets the user replace the default prompt
+    // entirely. Accepts values starting with `-` (unlike other flags), so
+    // `orbcode -s '- you are a code reviewer'` works.
+    const systemPromptOverride = takeSystemPrompt(args);
     const printIndex = args.findIndex((a) => a === "-p" || a === "--print");
     if (printIndex !== -1) {
         const prompt = args[printIndex + 1];
@@ -117,7 +151,7 @@ async function main() {
             console.error("Missing prompt after -p");
             process.exit(1);
         }
-        await runHeadless(prompt, args.includes("--yolo"));
+        await runHeadless(prompt, args.includes("--yolo"), systemPromptOverride);
         return;
     }
     const initialView = args[0] === "login" ? "login" : undefined;
@@ -132,7 +166,7 @@ async function main() {
     // Fire-and-forget: a stale or no-network state just means the header shows
     // the "current version" line instead of an upgrade prompt.
     const updateCheckPromise = getUpdateInfo(PACKAGE_NAME, VERSION);
-    render(_jsx(App, { initialView: initialView, initialPrompt: initialPrompt, initialSession: initialSession, updateCheck: updateCheckPromise }));
+    render(_jsx(App, { initialView: initialView, initialPrompt: initialPrompt, initialSession: initialSession, systemPromptOverride: systemPromptOverride, updateCheck: updateCheckPromise }));
 }
 main().catch((error) => {
     console.error(error);

package/dist/ui/App.js

@@ -20,7 +20,7 @@ import { StatusBar } from "./components/StatusBar.js";
 import { ModelPicker } from "./components/ModelPicker.js";
 import { SessionPicker } from "./components/SessionPicker.js";
 import { listSessions } from "../core/sessions.js";
-import { RowView, formatToolName } from "./components/rows.js";
+import { RowView } from "./components/rows.js";
 const SLASH_COMMANDS = [
     { name: "/help", description: "show available commands" },
     { name: "/model", description: "select the Axon model to use" },
@@ -161,7 +161,7 @@ let rowCounter = 0;
 function rowId() {
     return `row-${rowCounter++}`;
 }
-export function App({ initialView, initialPrompt, initialSession, updateCheck, }) {
+export function App({ initialView, initialPrompt, initialSession, systemPromptOverride, updateCheck, }) {
     const { exit } = useApp();
     const [settings, setSettings] = useState(() => loadSettings());
     const [view, setView] = useState(initialView ?? (getAuthToken(settings) ? "chat" : "login"));
@@ -178,7 +178,6 @@ export function App({ initialView, initialPrompt, initialSession, updateCheck, }
     const [busyLabel, setBusyLabel] = useState("Thinking");
     const [streamingReasoning, setStreamingReasoning] = useState("");
     const [streamingText, setStreamingText] = useState("");
-    const [runningTool, setRunningTool] = useState(null);
     const [pendingApproval, setPendingApproval] = useState(null);
     const [pendingFollowup, setPendingFollowup] = useState(null);
     // Set when the current project defines hooks that haven't been trusted yet;
@@ -234,6 +233,9 @@ export function App({ initialView, initialPrompt, initialSession, updateCheck, }
     const deferredPromptRef = useRef(null);
     // Guards endAndExit against double-invocation (Ctrl+D spam).
     const exitingRef = useRef(false);
+    // Mirror of the `-s` override so a fresh agent (created mid-session via
+    // /new or /resume) keeps the override instead of falling back to default.
+    const systemPromptOverrideRef = useRef(systemPromptOverride);
     const enqueueMessage = useCallback((text) => {
         queueRef.current = [...queueRef.current, text];
         setQueuedMessages(queueRef.current);
@@ -301,6 +303,7 @@ export function App({ initialView, initialPrompt, initialSession, updateCheck, }
                 });
                 reasoningBufferRef.current = "";
                 setStreamingReasoning("");
+                setBusyLabel("Working");
                 break;
             case "text-delta":
                 textBufferRef.current += event.text;
@@ -311,18 +314,13 @@ export function App({ initialView, initialPrompt, initialSession, updateCheck, }
                 pushRow({ kind: "assistant", text: textBufferRef.current });
                 textBufferRef.current = "";
                 setStreamingText("");
+                setBusyLabel("Working");
                 break;
             case "tool-start":
-                setRunningTool({
-                    id: event.id,
-                    name: event.name,
-                    summary: event.summary,
-                });
-                setBusyLabel(`Running ${event.name}`);
+                setBusyLabel("Working");
                 break;
             case "tool-end":
-                setRunningTool(null);
-                setBusyLabel("Thinking");
+                setBusyLabel("Working");
                 pushRow({
                     kind: "tool",
                     name: event.name,
@@ -366,7 +364,6 @@ export function App({ initialView, initialPrompt, initialSession, updateCheck, }
                     reasoningBufferRef.current = "";
                     setStreamingReasoning("");
                 }
-                setRunningTool(null);
                 setBusy(false);
                 maybeFetchTitle();
                 refreshUsage();
@@ -409,6 +406,9 @@ export function App({ initialView, initialPrompt, initialSession, updateCheck, }
             hooks: current.hooks,
             mcp: mcpManagerRef.current,
             resume,
+            // The override (from `-s`) is captured in a ref so a /new or /resume
+            // mid-session still applies it to the new agent.
+            systemPromptOverride: systemPromptOverrideRef.current,
             callbacks: {
                 onEvent: handleEvent,
                 requestApproval: (request) => new Promise((resolve) => setPendingApproval({ request, resolve })),
@@ -902,7 +902,7 @@ export function App({ initialView, initialPrompt, initialSession, updateCheck, }
         !modelPickerOpen &&
         !mcpPickerOpen &&
         !resumableSessions;
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Static, { items: rows, children: (row) => _jsx(RowView, { row: row }, row.id) }, staticKey), view === "login" ? (_jsx(LoginSection, { onLogin: handleLogin })) : (_jsxs(Box, { flexDirection: "column", children: [updateInfo?.updateAvailable && updateInfo.latest && (_jsxs(Box, { marginTop: 1, flexDirection: "column", borderStyle: "round", borderColor: COLORS.warning, paddingX: 2, alignSelf: "flex-start", children: [_jsxs(Text, { color: COLORS.warning, bold: true, children: ["\u2191 Update available: v", updateInfo.current, " \u2192 v", updateInfo.latest] }), _jsxs(Text, { children: ["Run ", _jsx(Text, { color: COLORS.accent, children: "orbcode update" }), " to install the latest version, then relaunch."] })] })), streamingReasoning && (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsx(Text, { color: COLORS.thinking, italic: true, children: "\u2726 Thinking\u2026" }), _jsx(Box, { paddingLeft: 2, children: _jsx(Text, { dimColor: true, italic: true, children: tail(streamingReasoning, expandReasoningRef.current ? 30 : 3) }) })] })), streamingText && (_jsx(Box, { marginTop: 1, children: _jsxs(Text, { children: [_jsx(Text, { color: COLORS.primary, children: "\u25CF " }), streamingText] }) })), runningTool && (_jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: COLORS.warning, children: [formatToolName(runningTool.name), " ", _jsx(Text, { dimColor: true, children: runningTool.summary })] }) })), taskLines.length > 0 && (_jsxs(Box, { flexDirection: "column", marginTop: 1, paddingLeft: 1, children: [_jsx(Text, { dimColor: true, bold: true, children: "Tasks" }), taskLines.slice(0, 10).map((line, i) => (_jsx(Text, { dimColor: /^[-*]\s*\[x\]/i.test(line), children: line
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Static, { items: rows, children: (row) => _jsx(RowView, { row: row }, row.id) }, staticKey), view === "login" ? (_jsx(LoginSection, { onLogin: handleLogin })) : (_jsxs(Box, { flexDirection: "column", children: [updateInfo?.updateAvailable && updateInfo.latest && (_jsxs(Box, { marginTop: 1, flexDirection: "column", borderStyle: "round", borderColor: COLORS.warning, paddingX: 2, alignSelf: "flex-start", children: [_jsxs(Text, { color: COLORS.warning, bold: true, children: ["\u2191 Update available: v", updateInfo.current, " \u2192 v", updateInfo.latest] }), _jsxs(Text, { children: ["Run ", _jsx(Text, { color: COLORS.accent, children: "orbcode update" }), " to install the latest version, then relaunch."] })] })), streamingReasoning && (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsx(Text, { color: COLORS.thinking, italic: true, children: "\u2726 Thinking\u2026" }), _jsx(Box, { paddingLeft: 2, children: _jsx(Text, { dimColor: true, italic: true, children: tail(streamingReasoning, expandReasoningRef.current ? 30 : 3) }) })] })), streamingText && (_jsx(Box, { marginTop: 1, children: _jsxs(Text, { children: [_jsx(Text, { color: COLORS.primary, children: "\u25CF " }), streamingText] }) })), taskLines.length > 0 && (_jsxs(Box, { flexDirection: "column", marginTop: 1, paddingLeft: 1, children: [_jsx(Text, { dimColor: true, bold: true, children: "Tasks" }), taskLines.slice(0, 10).map((line, i) => (_jsx(Text, { dimColor: /^[-*]\s*\[x\]/i.test(line), children: line
                                     .replace(/^[-*]\s*\[x\]/i, "  ■")
                                     .replace(/^[-*]\s*\[-\]/, "  ◧")
                                     .replace(/^[-*]\s*\[ \]/, "  □") }, i))), taskLines.length > 10 && (_jsxs(Text, { dimColor: true, children: [" \u2026 ", taskLines.length - 10, " more"] }))] })), modelPickerOpen && (_jsx(Box, { marginTop: 1, children: _jsx(ModelPicker, { currentId: settings.model, onSelect: (modelId) => {
@@ -925,7 +925,8 @@ export function App({ initialView, initialPrompt, initialSession, updateCheck, }
                         !pendingHookTrust &&
                         !pendingMcpApproval &&
                         !mcpPickerOpen &&
-                        !streamingText && (_jsx(Box, { marginTop: 1, children: _jsx(Spinner, { label: busyLabel }) })), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [queuedMessages.length > 0 && (_jsxs(Box, { flexDirection: "column", paddingLeft: 1, marginBottom: 1, children: [_jsxs(Text, { dimColor: true, bold: true, children: ["Queue (", queuedMessages.length, ")"] }), queuedMessages.slice(0, 5).map((msg, i) => (_jsxs(Text, { dimColor: true, children: [i + 1, ". ", truncateForQueue(msg).replace(/\n/g, "↵")] }, i))), queuedMessages.length > 5 && (_jsxs(Text, { dimColor: true, children: [" \u2026 ", queuedMessages.length - 5, " more"] }))] })), _jsx(InputBox, { active: inputActive, slashCommands: SLASH_COMMANDS, onSubmit: handleSubmit }), _jsx(StatusBar, { modelId: settings.model, contextTokens: contextTokens, totalCost: totalCost, state: busy ? busyLabel : "", approvalMode: approvalMode, busy: busy, title: sessionTitle, plan: usage?.plan, usagePercentage: usage?.usagePercentage, tieredUsage: usage?.tieredUsage })] })] }))] }));
+                        !streamingText &&
+                        !streamingReasoning && (_jsx(Box, { marginTop: 1, children: _jsx(Spinner, { label: busyLabel }) })), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [queuedMessages.length > 0 && (_jsxs(Box, { flexDirection: "column", paddingLeft: 1, marginBottom: 1, children: [_jsxs(Text, { dimColor: true, bold: true, children: ["Queue (", queuedMessages.length, ")"] }), queuedMessages.slice(0, 5).map((msg, i) => (_jsxs(Text, { dimColor: true, children: [i + 1, ". ", truncateForQueue(msg).replace(/\n/g, "↵")] }, i))), queuedMessages.length > 5 && (_jsxs(Text, { dimColor: true, children: [" \u2026 ", queuedMessages.length - 5, " more"] }))] })), _jsx(InputBox, { active: inputActive, slashCommands: SLASH_COMMANDS, onSubmit: handleSubmit }), _jsx(StatusBar, { modelId: settings.model, contextTokens: contextTokens, totalCost: totalCost, state: busy ? busyLabel : "", approvalMode: approvalMode, busy: busy, title: sessionTitle, plan: usage?.plan, usagePercentage: usage?.usagePercentage, tieredUsage: usage?.tieredUsage })] })] }))] }));
 }
 function tail(text, lines) {
     const all = text.split("\n").filter((l) => l.trim());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@matterailab/orbcode",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "OrbCode CLI — agentic coding in your terminal, powered by Axon models by MatterAI",
   "type": "module",
   "bin": {