@kisev/agentomatic 11.0.0-dev.58.gc136a777fcbb → 11.0.0-dev.59.g0506803c61e5

package/dist/config-setup.d.ts

@@ -2,32 +2,39 @@ import { type DependencyRunner } from "./self-install.js";
 import { LifecycleError, type Scope } from "./lifecycle.js";
 export declare class ConfigSetupError extends LifecycleError {
 }
-export declare const CONFIG_TARGETS: readonly ["opencode", "tui", "kilo", "mimo"];
+export declare const CONFIG_TARGETS: readonly ["opencode", "kilo", "mimo"];
 export type ConfigTargetName = (typeof CONFIG_TARGETS)[number];
+export type TargetFileKind = "main" | "tui";
 export declare const CONFIG_FRAGMENTS: readonly [{
     readonly name: "core-plugin";
     readonly description: "Register @kisev/agentomatic in the plugin array (OpenCode only)";
     readonly targets: readonly ["opencode"];
+    readonly file: "main";
 }, {
     readonly name: "skills-state-permissions";
     readonly description: "Allow the standard skills XDG state paths without per-run prompts";
     readonly targets: readonly ["opencode", "kilo", "mimo"];
+    readonly file: "main";
 }, {
     readonly name: "lsp-preset";
     readonly description: "Add LSP servers from the shared catalog (OpenCode only)";
     readonly targets: readonly ["opencode"];
+    readonly file: "main";
 }, {
     readonly name: "secrets-guard";
     readonly description: "Deny reads and edits of common secret files";
     readonly targets: readonly ["opencode", "kilo", "mimo"];
+    readonly file: "main";
 }, {
     readonly name: "kilo-display";
     readonly description: "Expand Kilo reasoning, terminal, edit, and tool blocks";
     readonly targets: readonly ["kilo"];
+    readonly file: "main";
 }, {
     readonly name: "tui-schema";
-    readonly description: "Add the tui.json schema and stacked diffs";
-    readonly targets: readonly ["tui"];
+    readonly description: "Unify each agent TUI file: schema, theme, stacked diffs, and leader keybinds";
+    readonly targets: readonly ["opencode", "kilo", "mimo"];
+    readonly file: "tui";
 }];
 export type FragmentName = (typeof CONFIG_FRAGMENTS)[number]["name"];
 export type ConfigSetupSelection = {

package/dist/config-setup.js

@@ -37,40 +37,68 @@ const SECRET_PATHS = [
 ];
 export class ConfigSetupError extends LifecycleError {
 }
-export const CONFIG_TARGETS = ["opencode", "tui", "kilo", "mimo"];
+export const CONFIG_TARGETS = ["opencode", "kilo", "mimo"];
 export const CONFIG_FRAGMENTS = [
     {
         name: "core-plugin",
         description: "Register @kisev/agentomatic in the plugin array (OpenCode only)",
         targets: ["opencode"],
+        file: "main",
     },
     {
         name: "skills-state-permissions",
         description: "Allow the standard skills XDG state paths without per-run prompts",
         targets: ["opencode", "kilo", "mimo"],
+        file: "main",
     },
     {
         name: "lsp-preset",
         description: "Add LSP servers from the shared catalog (OpenCode only)",
         targets: ["opencode"],
+        file: "main",
     },
     {
         name: "secrets-guard",
         description: "Deny reads and edits of common secret files",
         targets: ["opencode", "kilo", "mimo"],
+        file: "main",
     },
     {
         name: "kilo-display",
         description: "Expand Kilo reasoning, terminal, edit, and tool blocks",
         targets: ["kilo"],
+        file: "main",
     },
     {
         name: "tui-schema",
-        description: "Add the tui.json schema and stacked diffs",
-        targets: ["tui"],
+        description: "Unify each agent TUI file: schema, theme, stacked diffs, and leader keybinds",
+        targets: ["opencode", "kilo", "mimo"],
+        file: "tui",
     },
 ];
 const FRAGMENT_NAMES = CONFIG_FRAGMENTS.map((fragment) => fragment.name);
+const UNIFIED_TUI_KEYBINDS = {
+    command_list: "alt+p",
+    app_exit: "ctrl+d,<leader>q,<leader>й",
+    messages_first: "ctrl+g",
+    messages_last: "ctrl+alt+g",
+    editor_open: "<leader>e,<leader>у",
+    theme_list: "<leader>t,<leader>е",
+    sidebar_toggle: "<leader>b,<leader>и",
+    status_view: "<leader>s,<leader>ы",
+    session_export: "<leader>x,<leader>ч",
+    session_new: "<leader>n,<leader>т",
+    session_list: "<leader>l,<leader>д",
+    session_timeline: "<leader>g,<leader>п",
+    session_compact: "<leader>c,<leader>с",
+    model_list: "<leader>m,<leader>ь",
+    agent_list: "<leader>a,<leader>ф",
+    messages_copy: "<leader>y,<leader>н",
+    messages_undo: "<leader>u,<leader>г",
+    messages_redo: "<leader>r,<leader>к",
+    messages_toggle_conceal: "<leader>h,<leader>р",
+    tips_toggle: "<leader>h,<leader>р",
+};
 const LSP_SERVER_COMMANDS = {
     python: ["basedpyright-langserver", "--stdio"],
     typescript: ["typescript-language-server", "--stdio"],
@@ -153,20 +181,39 @@ function fragmentEdits(fragment, target, current) {
             { kind: "set-if-absent", path: ["mcp_tool_display"], value: "expanded" },
         ];
     }
+    const tuiSchemas = {
+        opencode: "https://opencode.ai/tui.json",
+        kilo: undefined,
+        mimo: "https://mimo.xiaomi.com/mimocode/tui.json",
+    };
     return [
-        { kind: "set-if-absent", path: ["$schema"], value: "https://opencode.ai/tui.json" },
+        ...(tuiSchemas[target]
+            ? [{ kind: "set-if-absent", path: ["$schema"], value: tuiSchemas[target] }]
+            : []),
+        { kind: "set-if-absent", path: ["theme"], value: "ayu" },
         { kind: "set-if-absent", path: ["diff_style"], value: "stacked" },
+        ...Object.entries(UNIFIED_TUI_KEYBINDS).map(([key, value]) => ({
+            kind: "set-if-absent",
+            path: ["keybinds", key],
+            value,
+        })),
     ];
 }
 function applicable(fragment, target) {
     const targets = CONFIG_FRAGMENTS.find((item) => item.name === fragment)?.targets ?? [];
     return targets.includes(target);
 }
+function fragmentFileKind(fragment) {
+    return CONFIG_FRAGMENTS.find((item) => item.name === fragment)?.file ?? "main";
+}
 export function normalizeConfigSelection(scope, value = {}) {
     const requestedTargets = value.targets ?? ["opencode"];
     const targets = CONFIG_TARGETS.filter((target) => requestedTargets.includes(target));
-    if (targets.length !== requestedTargets.length)
+    if (targets.length !== requestedTargets.length) {
+        if (requestedTargets.includes("tui"))
+            throw new ConfigSetupError("invalid_selection", "The tui target moved into opencode, kilo, and mimo as the tui-schema fragment");
         throw new ConfigSetupError("invalid_selection", "Unknown config target selection");
+    }
     if (scope === "project" && (targets.length !== 1 || targets[0] !== "opencode"))
         throw new ConfigSetupError("invalid_selection", "Project scope supports only the opencode target");
     const requestedFragments = value.fragments ?? [];
@@ -179,8 +226,6 @@ export async function defaultConfigSelection(scope, cwd = process.cwd(), home =
     const exists = async (path) => Boolean(await readRegular(path).catch(() => undefined));
     const targets = ["opencode"];
     if (scope === "global") {
-        if (await exists(join(home, ".config", "opencode", "tui.json")))
-            targets.push("tui");
         if (await exists(join(home, ".config", "kilo", "kilo.json")))
             targets.push("kilo");
         if (await exists(join(home, ".config", "kilo", "kilo.jsonc")))
@@ -195,9 +240,41 @@ export async function defaultConfigSelection(scope, cwd = process.cwd(), home =
         fragments: [...FRAGMENT_NAMES],
     });
 }
-async function resolveTargetFile(target, scope, cwd, home) {
+async function resolveTargetFile(target, scope, cwd, home, kind = "main") {
     const existing = async (root, path) => Boolean(await readRegular(join(root, path)).catch(() => undefined));
     const globalRoot = deploymentRoot("global", cwd, home);
+    if (kind === "tui") {
+        if (target === "kilo") {
+            const kiloRoot = join(home, ".config", "kilo");
+            for (const path of ["tui.jsonc", "tui.json"])
+                if (await existing(kiloRoot, path))
+                    return { target, root: kiloRoot, path, absolute: join(kiloRoot, path), exists: true };
+            return {
+                target,
+                root: kiloRoot,
+                path: "tui.jsonc",
+                absolute: join(kiloRoot, "tui.jsonc"),
+                exists: false,
+            };
+        }
+        if (target === "mimo") {
+            const mimoRoot = join(home, ".config", "mimocode");
+            return {
+                target,
+                root: mimoRoot,
+                path: "tui.json",
+                absolute: join(mimoRoot, "tui.json"),
+                exists: await existing(mimoRoot, "tui.json"),
+            };
+        }
+        return {
+            target,
+            root: globalRoot,
+            path: "tui.json",
+            absolute: join(globalRoot, "tui.json"),
+            exists: await existing(globalRoot, "tui.json"),
+        };
+    }
     if (target === "opencode") {
         if (scope === "global") {
             for (const path of ["opencode.json", "opencode.jsonc"])
@@ -228,14 +305,6 @@ async function resolveTargetFile(target, scope, cwd, home) {
             exists: false,
         };
     }
-    if (target === "tui")
-        return {
-            target,
-            root: globalRoot,
-            path: "tui.json",
-            absolute: join(globalRoot, "tui.json"),
-            exists: await existing(globalRoot, "tui.json"),
-        };
     if (target === "kilo") {
         const root = join(home, ".config", "kilo");
         for (const path of ["kilo.jsonc", "kilo.json"])
@@ -262,86 +331,101 @@ async function build(selection, scope, cwd = process.cwd(), home = homedir()) {
     const allowedRoots = new Set([root]);
     const files = [];
     for (const target of CONFIG_TARGETS.filter((name) => selection.targets.includes(name))) {
-        let file;
-        let current;
-        try {
-            file = await resolveTargetFile(target, scope, cwd, home);
-            current = file.exists ? await readRegular(file.absolute) : undefined;
-        }
-        catch (error) {
-            const reason = error instanceof LifecycleError ? error.message : "target is unreadable";
-            for (const fragment of selection.fragments.filter((item) => applicable(item, target)))
-                operations.push({ target, path: "unknown", fragment, operation: "conflict", reason });
-            continue;
-        }
-        if (file.exists && current === undefined) {
-            for (const fragment of selection.fragments.filter((item) => applicable(item, target)))
-                operations.push({
-                    target,
-                    path: file.absolute,
-                    fragment,
-                    operation: "conflict",
-                    reason: "target is unreadable",
-                });
-            continue;
-        }
-        files.push(file);
-        allowedRoots.add(file.root);
-        let text = current ? current.toString("utf8") : "{}\n";
-        let changed = false;
-        for (const fragment of selection.fragments) {
-            if (!applicable(fragment, target))
-                continue;
-            let parsed = undefined;
+        const kinds = ["main"];
+        const wantsTui = selection.fragments.some((fragment) => applicable(fragment, target) && fragmentFileKind(fragment) === "tui");
+        if (wantsTui && scope === "global")
+            kinds.push("tui");
+        for (const kind of kinds) {
+            let file;
+            let current;
             try {
-                parsed = parseJsonc(text);
+                file = await resolveTargetFile(target, scope, cwd, home, kind);
+                current = file.exists ? await readRegular(file.absolute) : undefined;
             }
-            catch {
-                parsed = undefined;
+            catch (error) {
+                const reason = error instanceof LifecycleError ? error.message : "target is unreadable";
+                for (const fragment of selection.fragments.filter((item) => applicable(item, target) && fragmentFileKind(item) === kind))
+                    operations.push({ target, path: "unknown", fragment, operation: "conflict", reason });
+                continue;
             }
-            try {
-                const applied = applyJsoncEdits(text, fragmentEdits(fragment, target, parsed));
-                if (applied.changed) {
-                    text = applied.text;
-                    changed = true;
+            if (file.exists && current === undefined) {
+                for (const fragment of selection.fragments.filter((item) => applicable(item, target) && fragmentFileKind(item) === kind))
                     operations.push({
                         target,
                         path: file.absolute,
                         fragment,
-                        operation: file.exists ? "update" : "create",
+                        operation: "conflict",
+                        reason: "target is unreadable",
                     });
+                continue;
+            }
+            files.push(file);
+            allowedRoots.add(file.root);
+            let text = current ? current.toString("utf8") : "{}\n";
+            let changed = false;
+            for (const fragment of selection.fragments) {
+                if (!applicable(fragment, target) || fragmentFileKind(fragment) !== kind)
+                    continue;
+                let parsed = undefined;
+                try {
+                    parsed = parseJsonc(text);
                 }
-                else {
-                    operations.push({ target, path: file.absolute, fragment, operation: "unchanged" });
+                catch {
+                    parsed = undefined;
+                }
+                try {
+                    const applied = applyJsoncEdits(text, fragmentEdits(fragment, target, parsed));
+                    if (applied.changed) {
+                        text = applied.text;
+                        changed = true;
+                        operations.push({
+                            target,
+                            path: file.absolute,
+                            fragment,
+                            operation: file.exists ? "update" : "create",
+                        });
+                    }
+                    else {
+                        operations.push({ target, path: file.absolute, fragment, operation: "unchanged" });
+                    }
+                }
+                catch (error) {
+                    operations.push({
+                        target,
+                        path: file.absolute,
+                        fragment,
+                        operation: "conflict",
+                        reason: error instanceof LifecycleError || error instanceof Error
+                            ? error.message
+                            : String(error),
+                    });
                 }
             }
-            catch (error) {
-                operations.push({
-                    target,
-                    path: file.absolute,
-                    fragment,
-                    operation: "conflict",
-                    reason: error instanceof LifecycleError || error instanceof Error
-                        ? error.message
-                        : String(error),
+            if (changed) {
+                const content = Buffer.from(text.endsWith("\n") ? text : `${text}\n`);
+                mutations.push({
+                    ...(file.root === root ? {} : { root: file.root }),
+                    path: file.path,
+                    operation: "write",
+                    content,
+                    mode: 0o644,
+                    expected: current ? { sha256: sha256(current) } : { absent: true },
                 });
             }
         }
-        if (changed) {
-            const content = Buffer.from(text.endsWith("\n") ? text : `${text}\n`);
-            mutations.push({
-                ...(file.root === root ? {} : { root: file.root }),
-                path: file.path,
-                operation: "write",
-                content,
-                mode: 0o644,
-                expected: current ? { sha256: sha256(current) } : { absent: true },
-            });
-        }
     }
     const skipped = selection.fragments
-        .filter((fragment) => !selection.targets.some((target) => applicable(fragment, target)))
-        .map((fragment) => ({ fragment, reason: "no selected target supports this fragment" }));
+        .filter((fragment) => {
+        if (fragmentFileKind(fragment) === "tui" && scope === "project")
+            return true;
+        return !selection.targets.some((target) => applicable(fragment, target));
+    })
+        .map((fragment) => ({
+        fragment,
+        reason: fragmentFileKind(fragment) === "tui" && scope === "project"
+            ? "TUI files are global-only"
+            : "no selected target supports this fragment",
+    }));
     const sorted = operations.sort((left, right) => CONFIG_TARGETS.indexOf(left.target) - CONFIG_TARGETS.indexOf(right.target) ||
         FRAGMENT_NAMES.indexOf(left.fragment) -
             FRAGMENT_NAMES.indexOf(right.fragment) ||

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kisev/agentomatic",
-  "version": "11.0.0-dev.58.gc136a777fcbb",
+  "version": "11.0.0-dev.59.g0506803c61e5",
   "description": "OpenCode integration and opt-in installer for portable Agent Skills.",
   "homepage": "https://github.com/kisev/skills#readme",
   "bugs": {
@@ -50,8 +50,8 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.8.1",
-    "@kisev/memomatic": "1.0.0-dev.58.gc136a777fcbb",
-    "@kisev/safe-fs": "1.0.0-dev.58.gc136a777fcbb"
+    "@kisev/memomatic": "1.0.0-dev.59.g0506803c61e5",
+    "@kisev/safe-fs": "1.0.0-dev.59.g0506803c61e5"
   },
   "devDependencies": {
     "@opencode-ai/plugin": "1.18.29",