@zhijiewang/openharness 0.5.1 → 0.6.0

package/dist/components/CybergotchiSprite.d.ts

@@ -1,8 +1,9 @@
-import type { CybergotchiConfig, CybergotchiState } from '../cybergotchi/types.js';
+import type { CompanionBones, CompanionConfig, CompanionState } from '../cybergotchi/types.js';
 interface Props {
-    config: CybergotchiConfig;
-    state: CybergotchiState;
+    bones: CompanionBones;
+    config: CompanionConfig;
+    state: CompanionState;
 }
-export default function CybergotchiSprite({ config, state }: Props): import("react/jsx-runtime").JSX.Element;
+export default function CybergotchiSprite({ bones, config, state }: Props): import("react/jsx-runtime").JSX.Element;
 export {};
 //# sourceMappingURL=CybergotchiSprite.d.ts.map

package/dist/components/CybergotchiSprite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CybergotchiSprite.d.ts","sourceRoot":"","sources":["../../src/components/CybergotchiSprite.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAInF,UAAU,KAAK;IACb,MAAM,EAAE,iBAAiB,CAAC;IAC1B,KAAK,EAAE,gBAAgB,CAAC;CACzB;AAED,MAAM,CAAC,OAAO,UAAU,iBAAiB,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,KAAK,2CAyBjE"}
+{"version":3,"file":"CybergotchiSprite.d.ts","sourceRoot":"","sources":["../../src/components/CybergotchiSprite.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAI/F,UAAU,KAAK;IACb,KAAK,EAAE,cAAc,CAAC;IACtB,MAAM,EAAE,eAAe,CAAC;IACxB,KAAK,EAAE,cAAc,CAAC;CACvB;AAED,MAAM,CAAC,OAAO,UAAU,iBAAiB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,KAAK,2CAiCxE"}

package/dist/components/CybergotchiSprite.js

@@ -1,20 +1,27 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Box, Text } from 'ink';
-import { EYE_STYLES, HAT_ART } from '../cybergotchi/types.js';
+import { EYE_STYLES, HAT_ART, RARITY_COLORS } from '../cybergotchi/types.js';
 import { getSpecies } from '../cybergotchi/species.js';
-export default function CybergotchiSprite({ config, state }) {
-    const species = getSpecies(config.species);
+export default function CybergotchiSprite({ bones, config, state }) {
+    const species = getSpecies(bones.species);
     const frames = species.frames[state.emotion];
     const frame = frames[state.frame % frames.length] ?? frames[0];
-    const eyes = EYE_STYLES[config.eyeStyle % EYE_STYLES.length] ?? 'o o';
+    const eyes = EYE_STYLES[bones.eyeStyle % EYE_STYLES.length] ?? 'o o';
     // Inject eyes into frame lines
     const lines = frame.map(line => line.replace('{E}', eyes));
     // Hat — stage 2 forces crown if no hat set
-    const hatKey = config.evolutionStage === 2 && config.hat === 'none' ? 'crown' : config.hat;
+    const hatKey = config.evolutionStage === 2 && config.soul.hat === 'none' ? 'crown' : config.soul.hat;
     const hat = HAT_ART[hatKey];
-    const spriteColor = config.evolutionStage === 2 ? 'yellow'
-        : config.evolutionStage === 1 ? 'magenta'
-            : 'cyan';
-    return (_jsxs(Box, { flexDirection: "column", children: [hat && _jsx(Text, { color: "yellow", children: hat }), lines.map((line, i) => (_jsx(Text, { color: spriteColor, children: line }, i)))] }));
+    // Color based on rarity (overridden by evolution stage for higher stages)
+    const spriteColor = config.evolutionStage === 2
+        ? 'yellow'
+        : config.evolutionStage === 1
+            ? 'magenta'
+            : RARITY_COLORS[bones.rarity];
+    // Shiny: cycle colors for a shimmer effect
+    const shinyColors = ['red', 'yellow', 'green', 'cyan', 'blue', 'magenta'];
+    const shinyColor = bones.isShiny ? shinyColors[state.frame % shinyColors.length] : undefined;
+    const color = shinyColor ?? spriteColor;
+    return (_jsxs(Box, { flexDirection: "column", children: [hat && _jsx(Text, { color: "yellow", children: hat }), lines.map((line, i) => (_jsx(Text, { color: color, children: line }, i)))] }));
 }
 //# sourceMappingURL=CybergotchiSprite.js.map

package/dist/components/CybergotchiSprite.js.map

@@ -1 +1 @@
-{"version":3,"file":"CybergotchiSprite.js","sourceRoot":"","sources":["../../src/components/CybergotchiSprite.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAEhC,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAOvD,MAAM,CAAC,OAAO,UAAU,iBAAiB,CAAC,EAAE,MAAM,EAAE,KAAK,EAAS;IAChE,MAAM,OAAO,GAAG,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC3C,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC7C,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,CAAC,CAAE,CAAC;IAChE,MAAM,IAAI,GAAG,UAAU,CAAC,MAAM,CAAC,QAAQ,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC;IAEtE,+BAA+B;IAC/B,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;IAE3D,2CAA2C;IAC3C,MAAM,MAAM,GAAG,MAAM,CAAC,cAAc,KAAK,CAAC,IAAI,MAAM,CAAC,GAAG,KAAK,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;IAC3F,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAE5B,MAAM,WAAW,GAAG,MAAM,CAAC,cAAc,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ;QACxD,CAAC,CAAC,MAAM,CAAC,cAAc,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;YACzC,CAAC,CAAC,MAAM,CAAC;IAEX,OAAO,CACL,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,aACxB,GAAG,IAAI,KAAC,IAAI,IAAC,KAAK,EAAC,QAAQ,YAAE,GAAG,GAAQ,EACxC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CACtB,KAAC,IAAI,IAAS,KAAK,EAAE,WAAW,YAAG,IAAI,IAA5B,CAAC,CAAmC,CAChD,CAAC,IACE,CACP,CAAC;AACJ,CAAC"}
+{"version":3,"file":"CybergotchiSprite.js","sourceRoot":"","sources":["../../src/components/CybergotchiSprite.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAEhC,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC7E,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAQvD,MAAM,CAAC,OAAO,UAAU,iBAAiB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAS;IACvE,MAAM,OAAO,GAAG,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC1C,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC7C,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,CAAC,CAAE,CAAC;IAChE,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC,QAAQ,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC;IAErE,+BAA+B;IAC/B,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;IAE3D,2CAA2C;IAC3C,MAAM,MAAM,GAAG,MAAM,CAAC,cAAc,KAAK,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;IACrG,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAE5B,0EAA0E;IAC1E,MAAM,WAAW,GAAG,MAAM,CAAC,cAAc,KAAK,CAAC;QAC7C,CAAC,CAAC,QAAQ;QACV,CAAC,CAAC,MAAM,CAAC,cAAc,KAAK,CAAC;YAC7B,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAEhC,2CAA2C;IAC3C,MAAM,WAAW,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,CAAU,CAAC;IACnF,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC7F,MAAM,KAAK,GAAG,UAAU,IAAI,WAAW,CAAC;IAExC,OAAO,CACL,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,aACxB,GAAG,IAAI,KAAC,IAAI,IAAC,KAAK,EAAC,QAAQ,YAAE,GAAG,GAAQ,EACxC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CACtB,KAAC,IAAI,IAAS,KAAK,EAAE,KAAK,YAAG,IAAI,IAAtB,CAAC,CAA6B,CAC1C,CAAC,IACE,CACP,CAAC;AACJ,CAAC"}

package/dist/components/DiffView.d.ts

@@ -0,0 +1,27 @@
+interface Props {
+    oldContent: string;
+    newContent: string;
+    filePath: string;
+    maxLines?: number;
+}
+/**
+ * Compute a simple unified diff between two strings.
+ * Returns an array of { type, line } entries.
+ */
+declare function computeDiff(oldText: string, newText: string): Array<{
+    type: 'add' | 'remove' | 'context';
+    line: string;
+}>;
+/**
+ * Filter diff to show only changed lines with N lines of context.
+ */
+declare function filterWithContext(diff: Array<{
+    type: 'add' | 'remove' | 'context';
+    line: string;
+}>, contextLines?: number): Array<{
+    type: 'add' | 'remove' | 'context' | 'separator';
+    line: string;
+}>;
+export default function DiffView({ oldContent, newContent, filePath, maxLines }: Props): import("react/jsx-runtime").JSX.Element;
+export { computeDiff, filterWithContext };
+//# sourceMappingURL=DiffView.d.ts.map

package/dist/components/DiffView.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"DiffView.d.ts","sourceRoot":"","sources":["../../src/components/DiffView.tsx"],"names":[],"mappings":"AAGA,UAAU,KAAK;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;;GAGG;AACH,iBAAS,WAAW,CAClB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GACd,KAAK,CAAC;IAAE,IAAI,EAAE,KAAK,GAAG,QAAQ,GAAG,SAAS,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAyB7D;AAED;;GAEG;AACH,iBAAS,iBAAiB,CACxB,IAAI,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,KAAK,GAAG,QAAQ,GAAG,SAAS,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,EACjE,YAAY,SAAI,GACf,KAAK,CAAC;IAAE,IAAI,EAAE,KAAK,GAAG,QAAQ,GAAG,SAAS,GAAG,WAAW,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAwB3E;AAED,MAAM,CAAC,OAAO,UAAU,QAAQ,CAAC,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAa,EAAE,EAAE,KAAK,2CA4B1F;AAED,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,CAAC"}

package/dist/components/DiffView.js

@@ -0,0 +1,74 @@
+import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
+import { Box, Text } from 'ink';
+/**
+ * Compute a simple unified diff between two strings.
+ * Returns an array of { type, line } entries.
+ */
+function computeDiff(oldText, newText) {
+    const oldLines = oldText.split('\n');
+    const newLines = newText.split('\n');
+    const result = [];
+    // Simple LCS-based diff
+    const maxLen = Math.max(oldLines.length, newLines.length);
+    let oi = 0;
+    let ni = 0;
+    while (oi < oldLines.length || ni < newLines.length) {
+        if (oi < oldLines.length && ni < newLines.length && oldLines[oi] === newLines[ni]) {
+            result.push({ type: 'context', line: oldLines[oi] });
+            oi++;
+            ni++;
+        }
+        else if (ni < newLines.length && (oi >= oldLines.length || !oldLines.slice(oi).includes(newLines[ni]))) {
+            result.push({ type: 'add', line: newLines[ni] });
+            ni++;
+        }
+        else {
+            result.push({ type: 'remove', line: oldLines[oi] });
+            oi++;
+        }
+    }
+    return result;
+}
+/**
+ * Filter diff to show only changed lines with N lines of context.
+ */
+function filterWithContext(diff, contextLines = 3) {
+    const changed = new Set();
+    diff.forEach((d, i) => {
+        if (d.type !== 'context') {
+            for (let j = Math.max(0, i - contextLines); j <= Math.min(diff.length - 1, i + contextLines); j++) {
+                changed.add(j);
+            }
+        }
+    });
+    const result = [];
+    let lastShown = -2;
+    diff.forEach((d, i) => {
+        if (changed.has(i)) {
+            if (i > lastShown + 1 && lastShown >= 0) {
+                result.push({ type: 'separator', line: '...' });
+            }
+            result.push(d);
+            lastShown = i;
+        }
+    });
+    return result;
+}
+export default function DiffView({ oldContent, newContent, filePath, maxLines = 30 }) {
+    const rawDiff = computeDiff(oldContent, newContent);
+    const filtered = filterWithContext(rawDiff);
+    const display = filtered.slice(0, maxLines);
+    const truncated = filtered.length > maxLines;
+    const adds = rawDiff.filter(d => d.type === 'add').length;
+    const removes = rawDiff.filter(d => d.type === 'remove').length;
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { dimColor: true, children: ['─── ', filePath, ' ───'] }), _jsxs(Text, { children: [_jsx(Text, { color: "green", children: `+${adds}` }), ' ', _jsx(Text, { color: "red", children: `-${removes}` })] }), display.map((d, i) => {
+                if (d.type === 'separator') {
+                    return _jsx(Text, { dimColor: true, children: '  ...' }, i);
+                }
+                const prefix = d.type === 'add' ? '+ ' : d.type === 'remove' ? '- ' : '  ';
+                const color = d.type === 'add' ? 'green' : d.type === 'remove' ? 'red' : undefined;
+                return _jsxs(Text, { color: color, children: [prefix, d.line] }, i);
+            }), truncated && _jsx(Text, { dimColor: true, children: `  ... (${filtered.length - maxLines} more lines)` })] }));
+}
+export { computeDiff, filterWithContext };
+//# sourceMappingURL=DiffView.js.map

package/dist/components/DiffView.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"DiffView.js","sourceRoot":"","sources":["../../src/components/DiffView.tsx"],"names":[],"mappings":"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"}

package/dist/components/Messages.js

@@ -8,7 +8,7 @@ export default function Messages({ messages, toolCalls }) {
     const theme = useTheme();
     return (_jsx(Box, { flexDirection: "column", children: messages.map((msg, i) => {
             const showDivider = msg.role === "user" && i > 0;
-            return (_jsxs(React.Fragment, { children: [showDivider && (_jsx(Text, { color: theme.dim, children: "─".repeat(60) })), _jsx(MessageRow, { message: msg, toolCalls: toolCalls, theme: theme })] }, msg.uuid));
+            return (_jsxs(React.Fragment, { children: [showDivider && (_jsx(Text, { color: theme.dim, children: "─".repeat(Math.min(60, process.stdout.columns ?? 80)) })), _jsx(MessageRow, { message: msg, toolCalls: toolCalls, theme: theme })] }, msg.uuid));
         }) }));
 }
 function MessageRow({ message, toolCalls, theme, }) {

package/dist/components/Messages.js.map

@@ -1 +1 @@
-{"version":3,"file":"Messages.js","sourceRoot":"","sources":["../../src/components/Messages.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Messages.js","sourceRoot":"","sources":["../../src/components/Messages.tsx"],"names":[],"mappings":"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"}

package/dist/components/PermissionPrompt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PermissionPrompt.d.ts","sourceRoot":"","sources":["../../src/components/PermissionPrompt.tsx"],"names":[],"mappings":"AAIA,KAAK,KAAK,GAAG;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;CACvC,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,EACvC,QAAQ,EACR,WAAW,EACX,SAAS,EACT,SAAS,GACV,EAAE,KAAK,2CAsDP"}
+{"version":3,"file":"PermissionPrompt.d.ts","sourceRoot":"","sources":["../../src/components/PermissionPrompt.tsx"],"names":[],"mappings":"AASA,KAAK,KAAK,GAAG;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;CACvC,CAAC;AAiCF,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,EACvC,QAAQ,EACR,WAAW,EACX,SAAS,EACT,SAAS,GACV,EAAE,KAAK,2CAwFP"}

package/dist/components/PermissionPrompt.js

@@ -1,36 +1,89 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { useState } from "react";
 import { Box, Text, useInput } from "ink";
 import { useTheme } from "../utils/theme.js";
+import DiffView from "./DiffView.js";
+import { readFileSync, existsSync, writeFileSync, unlinkSync } from "node:fs";
+import { execSync } from "node:child_process";
+import { join } from "node:path";
+import { tmpdir } from "node:os";
+/** Try to parse file path and content from tool args for diff display */
+function extractFileInfo(toolName, description) {
+    try {
+        const args = JSON.parse(description);
+        const name = toolName.toLowerCase();
+        if (name.includes('write') && args.file_path && args.content) {
+            const old = existsSync(args.file_path) ? readFileSync(args.file_path, 'utf-8') : '';
+            return { filePath: args.file_path, oldContent: old, newContent: args.content };
+        }
+        if (name.includes('edit') && args.file_path && args.old_string && args.new_string) {
+            if (existsSync(args.file_path)) {
+                const old = readFileSync(args.file_path, 'utf-8');
+                const newContent = old.replace(args.old_string, args.new_string);
+                return { filePath: args.file_path, oldContent: old, newContent, oldString: args.old_string, newString: args.new_string };
+            }
+        }
+        return null;
+    }
+    catch {
+        return null;
+    }
+}
 export default function PermissionPrompt({ toolName, description, riskLevel, onResolve, }) {
     const theme = useTheme();
+    const [showDiff, setShowDiff] = useState(false);
+    const fileInfo = extractFileInfo(toolName, description);
+    const hasDiff = fileInfo !== null && fileInfo.oldContent !== undefined && fileInfo.newContent !== undefined;
     useInput((input) => {
         const key = input.toLowerCase();
         if (key === "y")
             onResolve(true);
         if (key === "n")
             onResolve(false);
+        if (key === "d" && hasDiff)
+            setShowDiff(prev => !prev);
+        if (key === "e" && hasDiff && fileInfo?.newContent) {
+            // Open new content in $EDITOR
+            const editor = process.env.EDITOR || process.env.VISUAL || 'vi';
+            const tmpFile = join(tmpdir(), `oh-edit-${Date.now()}.tmp`);
+            try {
+                writeFileSync(tmpFile, fileInfo.newContent);
+                execSync(`${editor} "${tmpFile}"`, { stdio: 'inherit' });
+                // User may have modified — we can't easily integrate the edit back into the tool call
+                // Just show a message
+                unlinkSync(tmpFile);
+            }
+            catch { /* ignore */ }
+        }
     });
     const borderColor = riskLevel === "high"
         ? theme.error
         : riskLevel === "medium"
             ? theme.warning
             : theme.success;
-    // Extract contextual info from description
     const suggestion = extractSuggestion(toolName, description);
-    return (_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: borderColor, paddingX: 2, paddingY: 0, marginY: 1, children: [_jsxs(Box, { children: [_jsx(Text, { color: borderColor, bold: true, children: "⚠ " }), _jsx(Text, { bold: true, children: toolName }), _jsxs(Text, { color: theme.dim, children: [" ", riskLevel, " risk"] })] }), suggestion && (_jsx(Box, { marginLeft: 2, children: _jsx(Text, { color: theme.dim, children: suggestion }) })), _jsx(Box, { marginLeft: 2, marginY: 0, children: _jsx(Text, { children: description.slice(0, 300) }) }), _jsx(Box, { marginTop: 0, children: _jsxs(Text, { children: ["Allow? [", _jsx(Text, { color: theme.success, bold: true, children: "Y" }), "/", _jsx(Text, { color: theme.error, bold: true, children: "N" }), "]", " "] }) })] }));
+    return (_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: borderColor, paddingX: 2, paddingY: 0, marginY: 1, children: [_jsxs(Box, { children: [_jsx(Text, { color: borderColor, bold: true, children: "⚠ " }), _jsx(Text, { bold: true, children: toolName }), _jsxs(Text, { color: theme.dim, children: [" ", riskLevel, " risk"] })] }), suggestion && (_jsx(Box, { marginLeft: 2, children: _jsx(Text, { color: theme.dim, children: suggestion }) })), !showDiff && (_jsx(Box, { marginLeft: 2, marginY: 0, children: _jsx(Text, { children: description.slice(0, 300) }) })), showDiff && hasDiff && (_jsx(Box, { marginLeft: 2, marginY: 0, children: _jsx(DiffView, { oldContent: fileInfo.oldContent, newContent: fileInfo.newContent, filePath: fileInfo.filePath ?? '' }) })), _jsx(Box, { marginTop: 0, children: _jsxs(Text, { children: ["[", _jsx(Text, { color: theme.success, bold: true, children: "Y" }), "]es", " ", "[", _jsx(Text, { color: theme.error, bold: true, children: "N" }), "]o", hasDiff && (_jsxs(_Fragment, { children: [" ", "[", _jsx(Text, { color: "cyan", bold: true, children: "D" }), "]iff", " ", "[", _jsx(Text, { color: "yellow", bold: true, children: "E" }), "]dit"] }))] }) })] }));
 }
 function extractSuggestion(toolName, description) {
     const lower = toolName.toLowerCase();
     if (lower === "bash" || lower === "shell" || lower === "execute") {
-        // Try to extract the command
         const cmdMatch = description.match(/command[:\s]+["`]?(.+?)["`]?(?:\n|$)/i);
         if (cmdMatch)
             return `$ ${cmdMatch[1]}`;
     }
-    if (lower === "read" || lower === "write" || lower === "edit") {
-        const pathMatch = description.match(/(?:path|file)[:\s]+["`]?([^\s"`]+)/i);
-        if (pathMatch)
-            return `${lower === "read" ? "reading" : lower === "write" ? "writing" : "editing"} ${pathMatch[1]}`;
+    if (lower.includes("read") || lower.includes("write") || lower.includes("edit")) {
+        try {
+            const args = JSON.parse(description);
+            if (args.file_path) {
+                const action = lower.includes("read") ? "reading" : lower.includes("write") ? "writing" : "editing";
+                return `${action} ${args.file_path}`;
+            }
+        }
+        catch {
+            const pathMatch = description.match(/(?:path|file)[:\s]+["`]?([^\s"`]+)/i);
+            if (pathMatch)
+                return `${lower.includes("read") ? "reading" : lower.includes("write") ? "writing" : "editing"} ${pathMatch[1]}`;
+        }
     }
     return null;
 }

package/dist/components/PermissionPrompt.js.map

@@ -1 +1 @@
-{"version":3,"file":"PermissionPrompt.js","sourceRoot":"","sources":["../../src/components/PermissionPrompt.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"PermissionPrompt.js","sourceRoot":"","sources":["../../src/components/PermissionPrompt.tsx"],"names":[],"mappings":"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"}

package/dist/components/REPL.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"REPL.d.ts","sourceRoot":"","sources":["../../src/components/REPL.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAEnD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAwF9D,KAAK,SAAS,GAAG;IACf,QAAQ,EAAE,QAAQ,CAAC;IACnB,KAAK,EAAE,KAAK,CAAC;IACb,cAAc,EAAE,cAAc,CAAC;IAC/B,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,OAAO,EAAE,CAAC;IAC5B,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AAUF,MAAM,CAAC,OAAO,UAAU,IAAI,CAAC,EAC3B,QAAQ,EACR,KAAK,EACL,cAAc,EACd,YAAY,EACZ,KAAK,EACL,eAAe,EACf,eAAe,GAChB,EAAE,SAAS,2CAwdX"}
+{"version":3,"file":"REPL.d.ts","sourceRoot":"","sources":["../../src/components/REPL.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAEnD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAyF9D,KAAK,SAAS,GAAG;IACf,QAAQ,EAAE,QAAQ,CAAC;IACnB,KAAK,EAAE,KAAK,CAAC;IACb,cAAc,EAAE,cAAc,CAAC;IAC/B,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,OAAO,EAAE,CAAC;IAC5B,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AAUF,MAAM,CAAC,OAAO,UAAU,IAAI,CAAC,EAC3B,QAAQ,EACR,KAAK,EACL,cAAc,EACd,YAAY,EACZ,KAAK,EACL,eAAe,EACf,eAAe,GAChB,EAAE,SAAS,2CAkhBX"}

package/dist/components/REPL.js

@@ -17,16 +17,14 @@ import PermissionPrompt from "./PermissionPrompt.js";
 import CybergotchiPanelConnected from "./CybergotchiPanelConnected.js";
 import CybergotchiSetup from "./CybergotchiSetup.js";
 import { cybergotchiEvents } from "../cybergotchi/events.js";
-/** Width of the cybergotchi panel (22 content + 2 border + 2 padding + 1 margin) */
-const PANEL_TOTAL_WIDTH = 27;
-/** Minimum terminal width to show the cybergotchi panel */
-const MIN_WIDTH_FOR_PANEL = 60;
+/** Minimum terminal width to show the companion */
+const MIN_WIDTH_FOR_COMPANION = 40;
 function getTerminalWidth() {
     return process.stdout.columns ?? 80;
 }
+/** Chat gets full terminal width now (no sidebar) */
 function getChatWidth() {
-    const tw = getTerminalWidth();
-    return tw >= MIN_WIDTH_FOR_PANEL ? tw - PANEL_TOTAL_WIDTH : tw;
+    return getTerminalWidth();
 }
 /** Truncate a string to fit within maxWidth columns */
 function truncateLine(line, maxWidth) {
@@ -85,7 +83,10 @@ function printMessageToStdout(msg, showDivider) {
     if (out)
         process.stdout.write(out);
 }
-import { loadCybergotchiConfig, saveCybergotchiConfig } from "../cybergotchi/config.js";
+import { loadCompanionConfig, saveCompanionConfig } from "../cybergotchi/config.js";
+import { detectMemories, saveMemory } from "../harness/memory.js";
+import { resolveMcpMention } from "../mcp/loader.js";
+import { createKeybindingMatcher } from "../harness/keybindings.js";
 export default function REPL({ provider, tools, permissionMode, systemPrompt, model, initialMessages, resumeSessionId, }) {
     const { exit } = useApp();
     // Session and cost tracking
@@ -114,7 +115,8 @@ export default function REPL({ provider, tools, permissionMode, systemPrompt, mo
     const [error, setError] = useState(null);
     const [currentModel, setCurrentModel] = useState(model ?? "");
     const [showCybergotchiSetup, setShowCybergotchiSetup] = useState(false);
-    const cybergotchiConfigRef = useRef(loadCybergotchiConfig());
+    const [vimMode, setVimMode] = useState(false);
+    const cybergotchiConfigRef = useRef(loadCompanionConfig());
     // Print new finalized messages to stdout (outside Ink's live area) to prevent
     // Ink height miscounting from causing the cybergotchi panel to expand on each tick.
     const printedRef = useRef(new Set());
@@ -136,7 +138,7 @@ export default function REPL({ provider, tools, permissionMode, systemPrompt, mo
         const cfg = cybergotchiConfigRef.current;
         if (cfg) {
             cfg.lifetime.totalSessions += 1;
-            saveCybergotchiConfig(cfg);
+            saveCompanionConfig(cfg);
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
@@ -170,10 +172,21 @@ export default function REPL({ provider, tools, permissionMode, systemPrompt, mo
                 clearTimeout(loadingTimerRef.current);
         };
     }, [loading]);
-    // Ctrl+C during loading aborts the current query
+    // Keybinding matcher + pending action ref
+    const keybindingMatcher = useRef(createKeybindingMatcher()).current;
+    const pendingKeybindAction = useRef(null);
+    // Ctrl+C during loading aborts; custom keybindings queue actions
     useInput((_input, key) => {
         if (key.ctrl && _input === "c" && loading && abortControllerRef.current) {
             abortControllerRef.current.abort();
+            return;
+        }
+        // Custom keybinding check (only when not loading and not in a prompt)
+        if (!loading && !pendingPermission && !pendingQuestion) {
+            const action = keybindingMatcher.match(_input, { ctrl: key.ctrl, meta: key.meta, shift: key.shift });
+            if (action) {
+                pendingKeybindAction.current = action;
+            }
         }
     });
     // Queue prompt submissions — useEffect picks them up for async processing
@@ -226,9 +239,25 @@ export default function REPL({ provider, tools, permissionMode, systemPrompt, mo
                 model: currentModel || undefined,
                 abortSignal: abortController.signal,
             };
+            // Resolve @mentions to MCP resource content
+            let resolvedPrompt = prompt;
+            const mentionPattern = /@(\w[\w.-]*)/g;
+            const mentions = [...prompt.matchAll(mentionPattern)].map(m => m[1]);
+            const companionName = cybergotchiConfigRef.current?.soul?.name?.toLowerCase();
+            for (const mention of mentions) {
+                if (companionName && mention.toLowerCase() === companionName)
+                    continue;
+                try {
+                    const content = await resolveMcpMention(mention);
+                    if (content) {
+                        resolvedPrompt += `\n\n[Resource @${mention}]:\n${content.slice(0, 5000)}`;
+                    }
+                }
+                catch { /* ignore */ }
+            }
             let accumulated = "";
             try {
-                for await (const event of query(prompt, config, messagesRef.current)) {
+                for await (const event of query(resolvedPrompt, config, messagesRef.current)) {
                     switch (event.type) {
                         case "rate_limited":
                             setStreamingText(`⏳ Rate limited — retrying in ${event.retryIn}s… (attempt ${event.attempt}/3)`);
@@ -355,6 +384,17 @@ export default function REPL({ provider, tools, permissionMode, systemPrompt, mo
                 abortControllerRef.current = null;
                 setLoading(false);
                 setStreamingText("");
+                // Auto-memory: detect learnable patterns every 5 turns (async, non-blocking)
+                const msgCount = messagesRef.current.length;
+                if (msgCount > 0 && msgCount % 10 === 0) {
+                    detectMemories(provider, messagesRef.current.slice(-10), model)
+                        .then(memories => {
+                        for (const m of memories) {
+                            saveMemory(m.name, m.type, m.description, m.content);
+                        }
+                    })
+                        .catch(() => { });
+                }
             }
         };
         run();
@@ -369,7 +409,7 @@ export default function REPL({ provider, tools, permissionMode, systemPrompt, mo
         {
             const gotchiCfg = cybergotchiConfigRef.current;
             if (gotchiCfg) {
-                const name = gotchiCfg.name.toLowerCase();
+                const name = gotchiCfg.soul.name.toLowerCase();
                 const lower = trimmed.toLowerCase();
                 if (lower.startsWith(`@${name}`) || lower.startsWith(`${name},`) || lower.startsWith(`${name} `)) {
                     cybergotchiEvents.emit('cybergotchi', { type: 'userAddressed', text: trimmed });
@@ -377,6 +417,12 @@ export default function REPL({ provider, tools, permissionMode, systemPrompt, mo
                 }
             }
         }
+        // Handle /vim toggle directly
+        if (trimmed === "/vim") {
+            setVimMode(v => !v);
+            setMessages((prev) => [...prev, createInfoMessage(vimMode ? "Vim mode OFF" : "Vim mode ON")]);
+            return;
+        }
         // Process slash commands
         if (trimmed.startsWith("/")) {
             const ctx = {
@@ -435,17 +481,25 @@ export default function REPL({ provider, tools, permissionMode, systemPrompt, mo
         pendingPromptRef.current = input;
         setSubmitCount((c) => c + 1);
     }, [exit, currentModel, permissionMode, sessionId]);
+    // Process pending keybinding actions
+    useEffect(() => {
+        const action = pendingKeybindAction.current;
+        if (action && !loading) {
+            pendingKeybindAction.current = null;
+            handleSubmit(action);
+        }
+    });
     // Show cybergotchi setup if needed (first run or /cybergotchi reset)
     if (cybergotchiConfigRef.current === null || showCybergotchiSetup) {
-        return (_jsx(CybergotchiSetup, { onComplete: () => { cybergotchiConfigRef.current = loadCybergotchiConfig(); setShowCybergotchiSetup(false); }, onSkip: () => { cybergotchiConfigRef.current = loadCybergotchiConfig(); setShowCybergotchiSetup(false); } }));
+        return (_jsx(CybergotchiSetup, { onComplete: () => { cybergotchiConfigRef.current = loadCompanionConfig(); setShowCybergotchiSetup(false); }, onSkip: () => { cybergotchiConfigRef.current = loadCompanionConfig(); setShowCybergotchiSetup(false); } }));
     }
-    return (_jsxs(Box, { flexDirection: "row", children: [_jsxs(Box, { flexDirection: "column", flexGrow: 1, width: getChatWidth(), children: [thinkingText && (_jsx(Box, { marginY: 0, children: _jsxs(Text, { dimColor: true, children: ["💭 ", thinkingText.length > 200 ? thinkingText.slice(-200) + "…" : thinkingText] }) })), loading && streamingText && (_jsxs(Box, { marginY: 0, children: [_jsx(Text, { color: "magenta", bold: true, children: "◆ " }), _jsx(Text, { children: streamingText })] })), loading && !streamingText && _jsx(Spinner, { model: currentModel, tokens: costRef.current.totalOutputTokens }), error && (_jsx(Box, { marginY: 1, borderStyle: "round", borderColor: "red", paddingX: 1, children: _jsxs(Text, { color: "red", children: ["✗ ", error] }) })), pendingPermission && (_jsx(PermissionPrompt, { toolName: pendingPermission.toolName, description: pendingPermission.description, riskLevel: pendingPermission.riskLevel, onResolve: pendingPermission.resolve })), pendingQuestion && (_jsxs(Box, { flexDirection: "column", marginTop: 1, borderStyle: "round", borderColor: "yellow", paddingX: 1, children: [_jsxs(Text, { color: "yellow", children: ["\u2753 ", pendingQuestion.question] }), pendingQuestion.options && pendingQuestion.options.length > 0 && (_jsx(Box, { flexDirection: "column", children: pendingQuestion.options.map((o, i) => (_jsxs(Text, { dimColor: true, children: ["  ", i + 1, ". ", o] }, i))) })), _jsxs(Box, { children: [_jsx(Text, { color: "yellow", children: '❯ ' }), _jsx(TextInputComponent, { value: questionAnswer, onChange: setQuestionAnswer, onSubmit: (val) => { if (val.trim())
-                                            pendingQuestion.resolve(val.trim()); }, focus: true })] })] })), _jsx(Box, { marginTop: 1, children: _jsx(TextInput, { onSubmit: handleSubmit, disabled: loading || !!pendingQuestion }) }), _jsxs(Text, { dimColor: true, children: ["exit to quit", loading ? " | Ctrl+C to interrupt" : "", cybergotchiConfigRef.current?.name ? ` | @${cybergotchiConfigRef.current.name} to chat` : ""] }), (() => {
-                        const usage = contextUsage(currentModel, costRef.current.totalInputTokens);
-                        if (usage < 0.75)
-                            return null;
-                        const critical = usage >= 0.9;
-                        return (_jsx(Text, { color: critical ? "yellow" : undefined, bold: critical, dimColor: !critical, children: `⚠ Context ~${Math.round(usage * 100)}% full — consider /compact` }));
-                    })()] }), getTerminalWidth() >= MIN_WIDTH_FOR_PANEL && _jsx(CybergotchiPanelConnected, {})] }));
+    return (_jsx(Box, { flexDirection: "column", children: _jsxs(Box, { flexDirection: "column", flexGrow: 1, children: [thinkingText && (_jsx(Box, { marginY: 0, children: _jsxs(Text, { dimColor: true, children: ["💭 ", thinkingText.length > 200 ? thinkingText.slice(-200) + "…" : thinkingText] }) })), loading && streamingText && (_jsxs(Box, { marginY: 0, children: [_jsx(Text, { color: "magenta", bold: true, children: "◆ " }), _jsx(Text, { children: streamingText })] })), loading && !streamingText && _jsx(Spinner, { model: currentModel, tokens: costRef.current.totalOutputTokens }), error && (_jsx(Box, { marginY: 1, borderStyle: "round", borderColor: "red", paddingX: 1, children: _jsxs(Text, { color: "red", children: ["✗ ", error] }) })), pendingPermission && (_jsx(PermissionPrompt, { toolName: pendingPermission.toolName, description: pendingPermission.description, riskLevel: pendingPermission.riskLevel, onResolve: pendingPermission.resolve })), pendingQuestion && (_jsxs(Box, { flexDirection: "column", marginTop: 1, borderStyle: "round", borderColor: "yellow", paddingX: 1, children: [_jsxs(Text, { color: "yellow", children: ["\u2753 ", pendingQuestion.question] }), pendingQuestion.options && pendingQuestion.options.length > 0 && (_jsx(Box, { flexDirection: "column", children: pendingQuestion.options.map((o, i) => (_jsxs(Text, { dimColor: true, children: ["  ", i + 1, ". ", o] }, i))) })), _jsxs(Box, { children: [_jsx(Text, { color: "yellow", children: '❯ ' }), _jsx(TextInputComponent, { value: questionAnswer, onChange: setQuestionAnswer, onSubmit: (val) => { if (val.trim())
+                                        pendingQuestion.resolve(val.trim()); }, focus: true })] })] })), _jsxs(Box, { flexDirection: "row", marginTop: 1, children: [_jsx(Box, { flexDirection: "column", flexGrow: 1, children: _jsx(TextInput, { onSubmit: handleSubmit, disabled: loading || !!pendingQuestion, vimMode: vimMode }) }), getTerminalWidth() >= MIN_WIDTH_FOR_COMPANION && _jsx(CybergotchiPanelConnected, {})] }), _jsxs(Text, { dimColor: true, children: ["exit to quit", loading ? " | Ctrl+C to interrupt" : "", cybergotchiConfigRef.current?.soul?.name ? ` | @${cybergotchiConfigRef.current.soul.name} to chat` : ""] }), (() => {
+                    const usage = contextUsage(currentModel, costRef.current.totalInputTokens);
+                    if (usage < 0.75)
+                        return null;
+                    const critical = usage >= 0.9;
+                    return (_jsx(Text, { color: critical ? "yellow" : undefined, bold: critical, dimColor: !critical, children: `⚠ Context ~${Math.round(usage * 100)}% full — consider /compact` }));
+                })()] }) }));
 }
 //# sourceMappingURL=REPL.js.map