localant 1.0.2 → 1.1.0

package/packages/gateway/dist/stores/config-store.js

@@ -1,26 +1,43 @@
 import fs from "node:fs";
 import path from "node:path";
 import crypto from "node:crypto";
-import { ConfigSchema, defaultConfig, appPaths } from "@localant/shared";
+import { ConfigSchema, defaultConfig, appPaths, migrateLegacyConfigDir } from "@localant/shared";
 /** Loads, persists and initializes on-disk configuration and identity files. */
 export class ConfigStore {
     paths;
+    /** True only when using the real default location (not an explicit test base). */
+    isDefaultLocation;
     constructor(base) {
         this.paths = appPaths(base);
+        this.isDefaultLocation = base === undefined;
     }
     /** Create config dir tree and default files if missing. Idempotent. */
     ensureInitialized() {
         const p = this.paths;
+        // Before creating anything, migrate a pre-1.x install into ~/.localant.
+        if (this.isDefaultLocation) {
+            migrateLegacyConfigDir(p.root);
+        }
         for (const dir of [p.root, path.dirname(p.auditLog), p.skillsDir, p.backupsDir, p.workspaceDir, p.logsDir]) {
             fs.mkdirSync(dir, { recursive: true });
         }
         if (!fs.existsSync(p.configFile)) {
-            this.save(defaultConfig());
+            const config = defaultConfig();
+            config.tunnel.provider = "serveo";
+            const rand = crypto.randomBytes(16).toString("hex");
+            config.tunnel.subdomain = `localant-${rand}`;
+            this.save(config);
         }
         if (!fs.existsSync(p.tokenFile)) {
             const token = crypto.randomBytes(32).toString("base64url");
             fs.writeFileSync(p.tokenFile, token, { mode: 0o600 });
         }
+        if (!fs.existsSync(p.vaultKeyFile)) {
+            // A dedicated, random 256-bit vault key kept independent of the auth
+            // token, so rotating the token never makes stored secrets undecryptable.
+            const key = crypto.randomBytes(32).toString("base64");
+            fs.writeFileSync(p.vaultKeyFile, key, { mode: 0o600 });
+        }
         if (!fs.existsSync(p.secretsFile)) {
             fs.writeFileSync(p.secretsFile, JSON.stringify({}), { mode: 0o600 });
         }
@@ -34,7 +51,20 @@ export class ConfigStore {
     load() {
         try {
             const raw = JSON.parse(fs.readFileSync(this.paths.configFile, "utf8"));
-            return ConfigSchema.parse(raw);
+            const config = ConfigSchema.parse(raw);
+            // Merge missing default coding agents into existing config automatically
+            const def = defaultConfig();
+            let changed = false;
+            for (const [key, val] of Object.entries(def.codingAgents)) {
+                if (!config.codingAgents[key]) {
+                    config.codingAgents[key] = val;
+                    changed = true;
+                }
+            }
+            if (changed) {
+                this.save(config);
+            }
+            return config;
         }
         catch {
             return defaultConfig();
@@ -53,5 +83,19 @@ export class ConfigStore {
     getToken() {
         return fs.readFileSync(this.paths.tokenFile, "utf8").trim();
     }
+    /** Read the dedicated vault key (base64). Independent of the auth token. */
+    getVaultKey() {
+        return Buffer.from(fs.readFileSync(this.paths.vaultKeyFile, "utf8").trim(), "base64");
+    }
+    /**
+     * Generate a fresh auth token and persist it. Returns the new token. Because
+     * the vault key is stored separately, rotating the token does NOT invalidate
+     * stored secrets.
+     */
+    rotateToken() {
+        const token = crypto.randomBytes(32).toString("base64url");
+        fs.writeFileSync(this.paths.tokenFile, token, { mode: 0o600 });
+        return token;
+    }
 }
 //# sourceMappingURL=config-store.js.map

package/packages/gateway/dist/stores/config-store.js.map

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

package/packages/gateway/dist/stores/secret-vault.d.ts

@@ -1,16 +1,26 @@
 import type { AppPaths } from "@localant/shared";
 /**
  * Local secret vault. Values are encrypted at rest with AES-256-GCM using a
- * key derived from the auth token + machine-local salt. Secret *values* are
- * never returned by listing operations and never logged.
+ * dedicated random vault key stored separately from the auth token (see
+ * ConfigStore.getVaultKey). This means rotating the auth token never makes
+ * stored secrets undecryptable. Secret *values* are never returned by listing
+ * operations and never logged.
+ *
+ * For backward compatibility, a `legacyToken` may be supplied: secrets written
+ * by older versions (which derived the key from the auth token) are decrypted
+ * with the legacy key on read and transparently re-encrypted with the dedicated
+ * key via {@link migrate}.
  */
 export declare class SecretVault {
     private readonly file;
     private readonly key;
-    constructor(paths: AppPaths, token: string);
+    private readonly legacyKey?;
+    constructor(paths: AppPaths, key: Buffer, legacyToken?: string);
     private read;
     private write;
     private encrypt;
+    private decryptWith;
+    /** Decrypt with the current key, falling back to the legacy token-derived key. */
     private decrypt;
     set(name: string, value: string): void;
     get(name: string): string | undefined;
@@ -19,5 +29,11 @@ export declare class SecretVault {
     list(): string[];
     /** All current secret values, for redaction purposes only. */
     allValues(): string[];
+    /**
+     * Re-encrypt any secrets that only decrypt under the legacy token-derived key
+     * with the dedicated vault key. Idempotent; a no-op when there is no legacy
+     * key or nothing needs migrating. Returns the number of secrets migrated.
+     */
+    migrate(): number;
 }
 //# sourceMappingURL=secret-vault.d.ts.map

package/packages/gateway/dist/stores/secret-vault.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"secret-vault.d.ts","sourceRoot":"","sources":["../../src/stores/secret-vault.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEjD;;;;GAIG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAS;IAC9B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;gBAEjB,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM;IAK1C,OAAO,CAAC,IAAI;IAQZ,OAAO,CAAC,KAAK;IAIb,OAAO,CAAC,OAAO;IAQf,OAAO,CAAC,OAAO;IAYf,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAMtC,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAKrC,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAQ7B,iCAAiC;IACjC,IAAI,IAAI,MAAM,EAAE;IAIhB,8DAA8D;IAC9D,SAAS,IAAI,MAAM,EAAE;CAKtB"}
+{"version":3,"file":"secret-vault.d.ts","sourceRoot":"","sources":["../../src/stores/secret-vault.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEjD;;;;;;;;;;;GAWG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAS;IAC9B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAS;gBAExB,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM;IAQ9D,OAAO,CAAC,IAAI;IAQZ,OAAO,CAAC,KAAK;IAIb,OAAO,CAAC,OAAO;IAQf,OAAO,CAAC,WAAW;IAYnB,kFAAkF;IAClF,OAAO,CAAC,OAAO;IAMf,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAMtC,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAKrC,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAQ7B,iCAAiC;IACjC,IAAI,IAAI,MAAM,EAAE;IAIhB,8DAA8D;IAC9D,SAAS,IAAI,MAAM,EAAE;IAMrB;;;;OAIG;IACH,OAAO,IAAI,MAAM;CAelB"}

package/packages/gateway/dist/stores/secret-vault.js

@@ -2,15 +2,26 @@ import fs from "node:fs";
 import crypto from "node:crypto";
 /**
  * Local secret vault. Values are encrypted at rest with AES-256-GCM using a
- * key derived from the auth token + machine-local salt. Secret *values* are
- * never returned by listing operations and never logged.
+ * dedicated random vault key stored separately from the auth token (see
+ * ConfigStore.getVaultKey). This means rotating the auth token never makes
+ * stored secrets undecryptable. Secret *values* are never returned by listing
+ * operations and never logged.
+ *
+ * For backward compatibility, a `legacyToken` may be supplied: secrets written
+ * by older versions (which derived the key from the auth token) are decrypted
+ * with the legacy key on read and transparently re-encrypted with the dedicated
+ * key via {@link migrate}.
  */
 export class SecretVault {
     file;
     key;
-    constructor(paths, token) {
+    legacyKey;
+    constructor(paths, key, legacyToken) {
         this.file = paths.secretsFile;
-        this.key = crypto.createHash("sha256").update(`cla-vault:${token}`).digest();
+        this.key = key;
+        this.legacyKey = legacyToken
+            ? crypto.createHash("sha256").update(`cla-vault:${legacyToken}`).digest()
+            : undefined;
     }
     read() {
         try {
@@ -30,12 +41,12 @@ export class SecretVault {
         const tag = cipher.getAuthTag();
         return `${iv.toString("base64")}.${tag.toString("base64")}.${enc.toString("base64")}`;
     }
-    decrypt(blob) {
+    decryptWith(blob, key) {
         try {
             const [ivB, tagB, encB] = blob.split(".");
             if (!ivB || !tagB || !encB)
                 return undefined;
-            const decipher = crypto.createDecipheriv("aes-256-gcm", this.key, Buffer.from(ivB, "base64"));
+            const decipher = crypto.createDecipheriv("aes-256-gcm", key, Buffer.from(ivB, "base64"));
             decipher.setAuthTag(Buffer.from(tagB, "base64"));
             return Buffer.concat([decipher.update(Buffer.from(encB, "base64")), decipher.final()]).toString("utf8");
         }
@@ -43,6 +54,13 @@ export class SecretVault {
             return undefined;
         }
     }
+    /** Decrypt with the current key, falling back to the legacy token-derived key. */
+    decrypt(blob) {
+        const primary = this.decryptWith(blob, this.key);
+        if (primary !== undefined)
+            return primary;
+        return this.legacyKey ? this.decryptWith(blob, this.legacyKey) : undefined;
+    }
     set(name, value) {
         const data = this.read();
         data[name] = this.encrypt(value);
@@ -70,5 +88,28 @@ export class SecretVault {
             .map((k) => this.get(k))
             .filter((v) => typeof v === "string" && v.length > 0);
     }
+    /**
+     * Re-encrypt any secrets that only decrypt under the legacy token-derived key
+     * with the dedicated vault key. Idempotent; a no-op when there is no legacy
+     * key or nothing needs migrating. Returns the number of secrets migrated.
+     */
+    migrate() {
+        if (!this.legacyKey)
+            return 0;
+        const data = this.read();
+        let migrated = 0;
+        for (const [name, blob] of Object.entries(data)) {
+            if (this.decryptWith(blob, this.key) !== undefined)
+                continue; // already current
+            const legacy = this.decryptWith(blob, this.legacyKey);
+            if (legacy !== undefined) {
+                data[name] = this.encrypt(legacy);
+                migrated++;
+            }
+        }
+        if (migrated > 0)
+            this.write(data);
+        return migrated;
+    }
 }
 //# sourceMappingURL=secret-vault.js.map

package/packages/gateway/dist/stores/secret-vault.js.map

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

package/packages/gateway/dist/tools/adapters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adapters.d.ts","sourceRoot":"","sources":["../../src/tools/adapters.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,OAAO,GAAG,IAAI,CAqKtD"}
+{"version":3,"file":"adapters.d.ts","sourceRoot":"","sources":["../../src/tools/adapters.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAM7C;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,OAAO,GAAG,IAAI,CA0OtD"}

package/packages/gateway/dist/tools/adapters.js

@@ -1,5 +1,11 @@
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
 import { z } from "zod";
 import { commandExists, execFileSafe } from "../util/exec.js";
+const fsReadFileSync = (file) => fs.readFileSync(file, "utf8");
+const joinHome = (rel) => path.join(os.homedir(), rel);
+const joinCwd = (rel) => path.join(process.cwd(), rel);
 /**
  * Adapters bridge external systems (OpenClaw, Desktop Commander) and arbitrary
  * MCP servers. They never expose external tools to ChatGPT unmediated — every
@@ -112,20 +118,40 @@ export function registerAdapterTools(gw) {
     });
     r.register({
         name: "mcp_server_register",
-        description: "Register a downstream MCP server (stdio) to bridge through the gateway.",
+        description: "Register a downstream MCP server (stdio or streamable-http) to bridge through the gateway.",
         risk: 2,
-        inputSchema: z.object({
+        inputSchema: z
+            .object({
             name: z.string(),
-            command: z.string(),
+            transport: z.enum(["stdio", "streamable-http"]).default("stdio"),
+            command: z.string().optional(),
             args: z.array(z.string()).default([]),
+            url: z.string().optional(),
+            headers: z.record(z.string(), z.string()).optional(),
+            bearerTokenSecretName: z.string().optional(),
             enabled: z.boolean().default(false),
+        })
+            .superRefine((v, ctx) => {
+            if (v.transport === "stdio" && !v.command)
+                ctx.addIssue({ code: z.ZodIssueCode.custom, message: "stdio requires command" });
+            if (v.transport === "streamable-http" && !v.url)
+                ctx.addIssue({ code: z.ZodIssueCode.custom, message: "streamable-http requires url" });
         }),
-        summarize: (i) => `register mcp server ${i.name}`,
+        summarize: (i) => `register mcp server ${i.name} (${i.transport})`,
         handler: (i) => {
             const cfg = gw.config();
-            const next = { ...cfg, mcpServers: { ...cfg.mcpServers, [i.name]: { command: i.command, args: i.args, transport: "stdio", enabled: i.enabled } } };
-            gw.saveConfig(next);
-            return { registered: i.name, enabled: i.enabled };
+            const entry = i.transport === "stdio"
+                ? { transport: "stdio", command: i.command, args: i.args, enabled: i.enabled }
+                : {
+                    transport: "streamable-http",
+                    url: i.url,
+                    args: [],
+                    headers: i.headers,
+                    bearerTokenSecretName: i.bearerTokenSecretName,
+                    enabled: i.enabled,
+                };
+            gw.saveConfig({ ...cfg, mcpServers: { ...cfg.mcpServers, [i.name]: entry } });
+            return { registered: i.name, transport: i.transport, enabled: i.enabled };
         },
     });
     r.register({
@@ -166,6 +192,171 @@ export function registerAdapterTools(gw) {
         summarize: (i) => `${i.name}.${i.tool}`,
         handler: (i) => gw.bridge.callTool(i.name, i.tool, i.input ?? {}),
     });
+    // ---------- MCP config imports (all imported servers start DISABLED) ----------
+    const importServers = (servers) => {
+        const cfg = gw.config();
+        const next = { ...cfg.mcpServers };
+        const imported = [];
+        for (const [name, s] of Object.entries(servers)) {
+            if (next[name])
+                continue; // never override an existing (possibly enabled) server
+            next[name] = { ...s, args: s.args ?? [], enabled: false };
+            imported.push(name);
+        }
+        if (imported.length)
+            gw.saveConfig({ ...cfg, mcpServers: next });
+        return { imported };
+    };
+    r.register({
+        name: "mcp_import_claude_config",
+        description: "Import MCP servers from Claude Code config (.mcp.json / ~/.claude.json). Imported servers start disabled.",
+        risk: 2,
+        inputSchema: z.object({ path: z.string().optional() }),
+        summarize: () => "import claude mcp config",
+        handler: (i) => importServers(readClaudeServers(i.path)),
+    });
+    r.register({
+        name: "mcp_import_codex_config",
+        description: "Import MCP servers from Codex config (~/.codex/config.toml / .codex/config.toml). Imported servers start disabled.",
+        risk: 2,
+        inputSchema: z.object({ path: z.string().optional() }),
+        summarize: () => "import codex mcp config",
+        handler: (i) => importServers(readCodexServers(i.path)),
+    });
+    r.register({
+        name: "mcp_import_opencode_config",
+        description: "Import MCP servers from OpenCode config (opencode.json / opencode.jsonc). Imported servers start disabled.",
+        risk: 2,
+        inputSchema: z.object({ path: z.string().optional() }),
+        summarize: () => "import opencode mcp config",
+        handler: (i) => importServers(readOpencodeServers(i.path)),
+    });
+    r.register({
+        name: "mcp_import_all_agent_configs",
+        description: "Import MCP servers from Claude Code, Codex, and OpenCode configs. Imported servers start disabled.",
+        risk: 2,
+        inputSchema: z.object({}).strip(),
+        summarize: () => "import all agent mcp configs",
+        handler: () => importServers({ ...readClaudeServers(), ...readCodexServers(), ...readOpencodeServers() }),
+    });
+}
+/** Safely read + parse a JSON file, returning {} on any error. */
+function readJson(file) {
+    try {
+        return JSON.parse(fsReadFileSync(file));
+    }
+    catch {
+        return {};
+    }
+}
+function normalizeServers(obj) {
+    const out = {};
+    if (!obj || typeof obj !== "object")
+        return out;
+    for (const [name, raw] of Object.entries(obj)) {
+        if (!raw || typeof raw !== "object")
+            continue;
+        if (typeof raw.url === "string") {
+            out[name] = { transport: "streamable-http", url: raw.url, headers: raw.headers };
+        }
+        else if (typeof raw.command === "string") {
+            out[name] = { transport: "stdio", command: raw.command, args: raw.args ?? [] };
+        }
+    }
+    return out;
+}
+function readClaudeServers(explicit) {
+    const candidates = explicit ? [explicit] : [joinCwd(".mcp.json"), joinHome(".claude.json")];
+    const merged = {};
+    for (const file of candidates) {
+        const json = readJson(file);
+        Object.assign(merged, normalizeServers(json.mcpServers));
+    }
+    return merged;
+}
+function readCodexServers(explicit) {
+    const candidates = explicit ? [explicit] : [joinHome(".codex/config.toml"), joinCwd(".codex/config.toml")];
+    const merged = {};
+    for (const file of candidates) {
+        let text = "";
+        try {
+            text = fsReadFileSync(file);
+        }
+        catch {
+            continue;
+        }
+        Object.assign(merged, parseCodexToml(text));
+    }
+    return merged;
+}
+function readOpencodeServers(explicit) {
+    const candidates = explicit ? [explicit] : [joinCwd("opencode.json"), joinCwd("opencode.jsonc")];
+    const merged = {};
+    for (const file of candidates) {
+        let text = "";
+        try {
+            text = fsReadFileSync(file);
+        }
+        catch {
+            continue;
+        }
+        try {
+            const json = JSON.parse(stripJsonComments(text));
+            // OpenCode uses `mcp` keyed by name with { type, command/url }.
+            const mcp = (json.mcp ?? json.mcpServers);
+            if (mcp) {
+                for (const [name, raw] of Object.entries(mcp)) {
+                    if (typeof raw.url === "string")
+                        merged[name] = { transport: "streamable-http", url: raw.url };
+                    else if (Array.isArray(raw.command))
+                        merged[name] = { transport: "stdio", command: raw.command[0], args: raw.command.slice(1) };
+                    else if (typeof raw.command === "string")
+                        merged[name] = { transport: "stdio", command: raw.command, args: raw.args ?? [] };
+                }
+            }
+        }
+        catch {
+            /* ignore */
+        }
+    }
+    return merged;
+}
+/** Minimal TOML reader for Codex `[mcp_servers.<name>]` blocks. */
+function parseCodexToml(text) {
+    const out = {};
+    let current;
+    for (const line of text.split("\n")) {
+        const header = /^\s*\[mcp_servers\.([^\]]+)\]\s*$/.exec(line);
+        if (header && header[1]) {
+            current = header[1].replace(/["']/g, "");
+            out[current] = { transport: "stdio", args: [] };
+            continue;
+        }
+        if (!current)
+            continue;
+        const entry = out[current];
+        if (!entry)
+            continue;
+        const cmd = /^\s*command\s*=\s*"([^"]+)"/.exec(line);
+        if (cmd)
+            entry.command = cmd[1];
+        const url = /^\s*url\s*=\s*"([^"]+)"/.exec(line);
+        if (url) {
+            entry.url = url[1];
+            entry.transport = "streamable-http";
+        }
+        const args = /^\s*args\s*=\s*\[(.*)\]/.exec(line);
+        if (args && args[1] !== undefined)
+            entry.args = args[1].split(",").map((s) => s.trim().replace(/["']/g, "")).filter(Boolean);
+    }
+    // Drop entries with neither command nor url.
+    for (const [k, v] of Object.entries(out))
+        if (!v.command && !v.url)
+            delete out[k];
+    return out;
+}
+function stripJsonComments(text) {
+    return text.replace(/\/\*[\s\S]*?\*\//g, "").replace(/(^|[^:])\/\/.*$/gm, "$1");
 }
 async function requireCli(cmd, args, hint) {
     if (!(await commandExists(cmd)))

package/packages/gateway/dist/tools/adapters.js.map

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

package/packages/gateway/dist/tools/adb.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adb.d.ts","sourceRoot":"","sources":["../../src/tools/adb.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAc7C,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,OAAO,GAAG,IAAI,CA6ClD"}
+{"version":3,"file":"adb.d.ts","sourceRoot":"","sources":["../../src/tools/adb.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAc7C,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,OAAO,GAAG,IAAI,CAwFlD"}

package/packages/gateway/dist/tools/adb.js

@@ -56,5 +56,47 @@ export function registerAdbTools(gw) {
             return { output: await adb(["install", "-r", resolved], i.serial) };
         },
     });
+    r.register({ name: "adb_uninstall", description: "Uninstall an app by package. Requires approval (risk 3).", risk: 3, inputSchema: dev.extend({ pkg: z.string() }), summarize: (i) => `adb uninstall ${i.pkg}`, handler: async (i) => ({ output: await adb(["uninstall", i.pkg], i.serial) }) });
+    r.register({ name: "adb_screen_size", description: "Get the device screen size.", risk: 0, inputSchema: dev, handler: async (i) => ({ output: await adb(["shell", "wm", "size"], i.serial) }) });
+    r.register({ name: "adb_current_package", description: "Get the current foreground package name.", risk: 0, inputSchema: dev, handler: async (i) => ({ output: await adb(["shell", "dumpsys", "window", "windows"], i.serial) }) });
+    r.register({ name: "adb_dump_ui", description: "Dump the current UI hierarchy (uiautomator).", risk: 1, inputSchema: dev, handler: async (i) => ({ output: await adb(["shell", "uiautomator", "dump", "/dev/tty"], i.serial) }) });
+    r.register({
+        name: "adb_pull",
+        description: "Pull a file from the device into the workspace directory. Risk 3.",
+        risk: 3,
+        inputSchema: dev.extend({ devicePath: z.string(), localName: z.string().optional() }),
+        summarize: (i) => `adb pull ${i.devicePath}`,
+        handler: async (i) => {
+            const dest = path.join(gw.paths.workspaceDir, i.localName ?? `adb-pull-${Date.now()}`);
+            gw.pathGuard.assertAccess(dest, "write");
+            return { output: await adb(["pull", i.devicePath, dest], i.serial), localPath: dest };
+        },
+    });
+    r.register({
+        name: "adb_push",
+        description: "Push a local file (inside an allowed directory) to the device. Risk 3.",
+        risk: 3,
+        inputSchema: dev.extend({ localPath: z.string(), devicePath: z.string() }),
+        summarize: (i) => `adb push ${i.localPath}`,
+        handler: async (i) => {
+            const resolved = gw.pathGuard.assertAccess(i.localPath, "read");
+            return { output: await adb(["push", resolved, i.devicePath], i.serial) };
+        },
+    });
+    r.register({
+        name: "adb_shell",
+        description: "Run an adb shell command. Dangerous commands (rm -rf, reboot, wipe, …) are rejected. Risk 3.",
+        risk: 3,
+        inputSchema: dev.extend({ command: z.string() }),
+        summarize: (i) => `adb shell ${i.command.slice(0, 60)}`,
+        handler: async (i) => {
+            const lower = i.command.toLowerCase();
+            const dangerous = ["rm -rf", "reboot", "wipe", "format", "dd ", "mkfs", "fastboot", "pm clear"];
+            if (dangerous.some((d) => lower.includes(d))) {
+                throw new Error(`adb_shell rejected: '${i.command}' contains a dangerous operation.`);
+            }
+            return { output: await adb(["shell", ...i.command.split(" ")], i.serial) };
+        },
+    });
 }
 //# sourceMappingURL=adb.js.map