@agentskit/cli 0.5.3 → 0.6.0

package/dist/bin.cjs

@@ -4,17 +4,19 @@
 var React3 = require('react');
 var ink = require('ink');
 var commander = require('commander');
-var path = require('path');
+var fs = require('fs');
+var os = require('os');
+var path3 = require('path');
 var promises = require('fs/promises');
 var ink$1 = require('@agentskit/ink');
 var adapters = require('@agentskit/adapters');
 var tools = require('@agentskit/tools');
 var skills = require('@agentskit/skills');
 var memory = require('@agentskit/memory');
+var crypto = require('crypto');
 var jsxRuntime = require('react/jsx-runtime');
 var prompts = require('@inquirer/prompts');
 var kleur = require('kleur');
-var fs = require('fs');
 var runtime = require('@agentskit/runtime');
 var child_process = require('child_process');
 var chokidar = require('chokidar');
@@ -22,7 +24,7 @@ var chokidar = require('chokidar');
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var React3__default = /*#__PURE__*/_interopDefault(React3);
-var path__default = /*#__PURE__*/_interopDefault(path);
+var path3__default = /*#__PURE__*/_interopDefault(path3);
 var kleur__default = /*#__PURE__*/_interopDefault(kleur);
 var chokidar__default = /*#__PURE__*/_interopDefault(chokidar);
 
@@ -44,7 +46,7 @@ async function loadTsConfig(path4) {
 }
 async function loadPackageJsonConfig(dir) {
   try {
-    const raw = await promises.readFile(path.join(dir, "package.json"), "utf8");
+    const raw = await promises.readFile(path3.join(dir, "package.json"), "utf8");
     const pkg = JSON.parse(raw);
     if (pkg.agentskit && typeof pkg.agentskit === "object") {
       return pkg.agentskit;
@@ -54,16 +56,38 @@ async function loadPackageJsonConfig(dir) {
     return void 0;
   }
 }
-async function loadConfig(options) {
-  const cwd = path.resolve(process.cwd());
-  const tsPath = path.join(cwd, ".agentskit.config.ts");
-  const tsConfig = await loadTsConfig(tsPath);
+function mergeConfigs(base, override) {
+  if (!base && !override) return void 0;
+  if (!base) return override;
+  if (!override) return base;
+  return {
+    ...base,
+    ...override,
+    tools: { ...base.tools, ...override.tools },
+    defaults: { ...base.defaults, ...override.defaults },
+    runtime: { ...base.runtime, ...override.runtime },
+    observability: { ...base.observability, ...override.observability }
+  };
+}
+async function loadLocalConfig(cwd) {
+  const tsConfig = await loadTsConfig(path3.join(cwd, ".agentskit.config.ts"));
   if (tsConfig) return tsConfig;
-  const jsonPath = path.join(cwd, ".agentskit.config.json");
-  const jsonConfig = await loadJsonConfig(jsonPath);
+  const jsonConfig = await loadJsonConfig(path3.join(cwd, ".agentskit.config.json"));
   if (jsonConfig) return jsonConfig;
   return await loadPackageJsonConfig(cwd);
 }
+async function loadGlobalConfig(home) {
+  const globalDir = path3.join(os.homedir(), ".agentskit");
+  const tsConfig = await loadTsConfig(path3.join(globalDir, "config.ts"));
+  if (tsConfig) return tsConfig;
+  return await loadJsonConfig(path3.join(globalDir, "config.json"));
+}
+async function loadConfig(options) {
+  const cwd = path3.resolve(process.cwd());
+  const global = await loadGlobalConfig();
+  const local = await loadLocalConfig(cwd);
+  return mergeConfigs(global, local);
+}
 var providers = {
   openai: {
     label: "OpenAI",
@@ -181,26 +205,41 @@ var skillRegistry = {
   critic: skills.critic,
   summarizer: skills.summarizer
 };
+function instantiate(kind) {
+  switch (kind) {
+    case "web_search":
+      return [tools.webSearch()];
+    case "fetch_url":
+      return [tools.fetchUrl()];
+    case "filesystem":
+      return tools.filesystem({ basePath: process.cwd() });
+    case "shell":
+      return [tools.shell({ timeout: 3e4 })];
+  }
+}
+function gateTool(tool) {
+  if (tool.requiresConfirmation === false) return tool;
+  return { ...tool, requiresConfirmation: true };
+}
 function resolveTools(toolNames) {
-  if (!toolNames) return [];
-  const tools$1 = [];
-  for (const name of toolNames.split(",").map((s) => s.trim())) {
+  if (!toolNames) {
+    return [...instantiate("web_search"), ...instantiate("fetch_url")].map(gateTool);
+  }
+  const tools = [];
+  for (const name of toolNames.split(",").map((s) => s.trim()).filter(Boolean)) {
     switch (name) {
       case "web_search":
-        tools$1.push(tools.webSearch());
-        break;
+      case "fetch_url":
       case "filesystem":
-        tools$1.push(...tools.filesystem({ basePath: process.cwd() }));
-        break;
       case "shell":
-        tools$1.push(tools.shell({ timeout: 3e4 }));
+        tools.push(...instantiate(name));
         break;
       default:
         process.stderr.write(`Unknown tool: ${name}
 `);
     }
   }
-  return tools$1;
+  return tools;
 }
 function resolveSkill(skillName) {
   if (!skillName) return void 0;
@@ -233,6 +272,244 @@ function resolveMemory(backend, memoryPath) {
       return memory.fileChatMemory(memoryPath);
   }
 }
+var ROOT = path3.join(os.homedir(), ".agentskit", "sessions");
+var META_SUFFIX = ".meta.json";
+function cwdHash(cwd = process.cwd()) {
+  return crypto.createHash("sha256").update(cwd).digest("hex").slice(0, 12);
+}
+function dirFor(cwd = process.cwd()) {
+  return path3.join(ROOT, cwdHash(cwd));
+}
+function ensureDir(dir) {
+  if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
+}
+function generateSessionId() {
+  const ts = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-").slice(0, 19);
+  const suffix = crypto.randomBytes(3).toString("hex");
+  return `${ts}-${suffix}`;
+}
+function sessionFilePath(id, cwd = process.cwd()) {
+  ensureDir(dirFor(cwd));
+  return path3.join(dirFor(cwd), `${id}.json`);
+}
+function metaPath(id, cwd = process.cwd()) {
+  return path3.join(dirFor(cwd), `${id}${META_SUFFIX}`);
+}
+function readMeta(id, cwd = process.cwd()) {
+  const path4 = metaPath(id, cwd);
+  if (!fs.existsSync(path4)) return null;
+  try {
+    return JSON.parse(fs.readFileSync(path4, "utf8"));
+  } catch {
+    return null;
+  }
+}
+function writeSessionMeta(meta, cwd = process.cwd()) {
+  ensureDir(dirFor(cwd));
+  fs.writeFileSync(metaPath(meta.id, cwd), JSON.stringify(meta, null, 2));
+}
+function derivePreview(messages) {
+  const firstUser = messages.find((m) => m.role === "user" && m.content.trim());
+  if (!firstUser) return "(empty)";
+  const single = firstUser.content.replace(/\s+/g, " ").trim();
+  return single.length > 80 ? `${single.slice(0, 80)}\u2026` : single;
+}
+function listSessions(cwd = process.cwd()) {
+  const dir = dirFor(cwd);
+  if (!fs.existsSync(dir)) return [];
+  const entries = fs.readdirSync(dir);
+  const records = [];
+  for (const entry of entries) {
+    if (!entry.endsWith(".json") || entry.endsWith(META_SUFFIX)) continue;
+    const id = entry.replace(/\.json$/, "");
+    const meta = readMeta(id, cwd);
+    const file = path3.join(dir, entry);
+    if (meta) {
+      records.push({ metadata: meta, file });
+    } else {
+      const stats = fs.statSync(file);
+      records.push({
+        metadata: {
+          id,
+          cwd,
+          createdAt: stats.birthtime.toISOString(),
+          updatedAt: stats.mtime.toISOString(),
+          messageCount: 0,
+          preview: "(legacy session)"
+        },
+        file
+      });
+    }
+  }
+  records.sort((a, b) => b.metadata.updatedAt.localeCompare(a.metadata.updatedAt));
+  return records;
+}
+function findLatestSession(cwd = process.cwd()) {
+  const all = listSessions(cwd);
+  return all[0] ?? null;
+}
+function findSession(id, cwd = process.cwd()) {
+  const exact = listSessions(cwd).find((s) => s.metadata.id === id);
+  if (exact) return exact;
+  const prefix = listSessions(cwd).find((s) => s.metadata.id.startsWith(id));
+  return prefix ?? null;
+}
+function resolveSession(input2) {
+  const cwd = input2.cwd ?? process.cwd();
+  if (input2.explicitPath) {
+    return { id: "custom", file: input2.explicitPath, isNew: !fs.existsSync(input2.explicitPath) };
+  }
+  if (input2.forceNew) {
+    const id2 = generateSessionId();
+    return { id: id2, file: sessionFilePath(id2, cwd), isNew: true };
+  }
+  if (input2.resumeId) {
+    const target = input2.resumeId === true ? findLatestSession(cwd) : findSession(input2.resumeId, cwd);
+    if (target) {
+      return { id: target.metadata.id, file: target.file, isNew: false };
+    }
+    process.stderr.write(
+      `No session matching "${String(input2.resumeId)}" \u2014 starting a new one.
+`
+    );
+  }
+  const latest = findLatestSession(cwd);
+  if (latest) return { id: latest.metadata.id, file: latest.file, isNew: false };
+  const id = generateSessionId();
+  return { id, file: sessionFilePath(id, cwd), isNew: true };
+}
+
+// src/slash-commands.ts
+function parseSlashCommand(input2) {
+  if (!input2.startsWith("/")) return null;
+  const match = input2.slice(1).match(/^(\S+)\s*([\s\S]*)$/);
+  if (!match) return null;
+  return { name: match[1], args: match[2] ?? "" };
+}
+function createSlashRegistry(commands) {
+  const map = /* @__PURE__ */ new Map();
+  for (const cmd of commands) {
+    map.set(cmd.name, cmd);
+    for (const alias of cmd.aliases ?? []) map.set(alias, cmd);
+  }
+  return map;
+}
+var builtinSlashCommands = [
+  {
+    name: "help",
+    aliases: ["?"],
+    description: "List available slash commands.",
+    run(ctx) {
+      const seen = /* @__PURE__ */ new Set();
+      const lines = [];
+      for (const cmd of ctx.commands) {
+        if (seen.has(cmd.name)) continue;
+        seen.add(cmd.name);
+        const suffix = cmd.usage ? `  (${cmd.usage})` : "";
+        lines.push(`  /${cmd.name.padEnd(10)} ${cmd.description}${suffix}`);
+      }
+      ctx.feedback(`Slash commands:
+${lines.join("\n")}`, "info");
+    }
+  },
+  {
+    name: "model",
+    description: "Switch the active model.",
+    usage: "/model <name>",
+    run(ctx, args) {
+      const value = args.trim();
+      if (!value) {
+        ctx.feedback(
+          `Current model: ${ctx.runtime.model ?? "unset"}. Usage: /model <name>`,
+          "warn"
+        );
+        return;
+      }
+      ctx.setModel(value);
+      ctx.feedback(`Model \u2192 ${value}`, "success");
+    }
+  },
+  {
+    name: "provider",
+    description: "Switch the adapter provider.",
+    usage: "/provider openai|anthropic|gemini|ollama|deepseek|grok|kimi|demo",
+    run(ctx, args) {
+      const value = args.trim();
+      if (!value) {
+        ctx.feedback(
+          `Current provider: ${ctx.runtime.provider}. Usage: /provider <name>`,
+          "warn"
+        );
+        return;
+      }
+      ctx.setProvider(value);
+      ctx.feedback(`Provider \u2192 ${value}`, "success");
+    }
+  },
+  {
+    name: "base-url",
+    aliases: ["baseurl"],
+    description: "Override provider base URL.",
+    usage: "/base-url <url|clear>",
+    run(ctx, args) {
+      const value = args.trim();
+      if (!value || value === "clear") {
+        ctx.setBaseUrl(void 0);
+        ctx.feedback("Base URL cleared.", "success");
+        return;
+      }
+      ctx.setBaseUrl(value);
+      ctx.feedback(`Base URL \u2192 ${value}`, "success");
+    }
+  },
+  {
+    name: "tools",
+    description: "Set active tools (comma-separated) or clear them.",
+    usage: "/tools web_search,fetch_url | /tools clear",
+    run(ctx, args) {
+      const value = args.trim();
+      if (!value || value === "clear") {
+        ctx.setTools(void 0);
+        ctx.feedback("Tools reset to defaults.", "success");
+        return;
+      }
+      ctx.setTools(value);
+      ctx.feedback(`Tools \u2192 ${value}`, "success");
+    }
+  },
+  {
+    name: "skill",
+    description: "Set active skill(s) (comma-separated) or clear them.",
+    usage: "/skill researcher,coder | /skill clear",
+    run(ctx, args) {
+      const value = args.trim();
+      if (!value || value === "clear") {
+        ctx.setSkill(void 0);
+        ctx.feedback("Skills cleared.", "success");
+        return;
+      }
+      ctx.setSkill(value);
+      ctx.feedback(`Skills \u2192 ${value}`, "success");
+    }
+  },
+  {
+    name: "clear",
+    aliases: ["reset"],
+    description: "Clear the conversation history in this session.",
+    async run(ctx) {
+      await ctx.chat.clear();
+      ctx.feedback("History cleared.", "success");
+    }
+  },
+  {
+    name: "exit",
+    aliases: ["quit", "q"],
+    description: "Exit the chat.",
+    run() {
+      process.exit(0);
+    }
+  }
+];
 function groupIntoTurns(messages) {
   const turns = [];
   let current = [];
@@ -252,24 +529,28 @@ function groupIntoTurns(messages) {
   return turns;
 }
 function ChatApp(options) {
-  const runtime = React3.useMemo(() => resolveChatProvider(options), [
-    options.apiKey,
-    options.baseUrl,
-    options.model,
-    options.provider
-  ]);
+  const [provider, setProvider] = React3.useState(options.provider);
+  const [model, setModel] = React3.useState(options.model);
+  const [apiKey, setApiKey] = React3.useState(options.apiKey);
+  const [baseUrl, setBaseUrl] = React3.useState(options.baseUrl);
+  const [toolsFlag, setToolsFlag] = React3.useState(options.tools);
+  const [skillFlag, setSkillFlag] = React3.useState(options.skill);
+  const runtime = React3.useMemo(
+    () => resolveChatProvider({ provider, model, apiKey, baseUrl }),
+    [provider, model, apiKey, baseUrl]
+  );
   const memory = React3.useMemo(
     () => resolveMemory(options.memoryBackend, options.memoryPath ?? ".agentskit-history.json"),
     [options.memoryPath, options.memoryBackend]
   );
-  const tools = React3.useMemo(() => resolveTools(options.tools), [options.tools]);
+  const tools = React3.useMemo(() => resolveTools(toolsFlag), [toolsFlag]);
   const skills = React3.useMemo(() => {
-    if (!options.skill) return void 0;
-    const names = options.skill.split(",").map((s) => s.trim());
+    if (!skillFlag) return void 0;
+    const names = skillFlag.split(",").map((s) => s.trim());
     const resolved = names.map((n) => skillRegistry[n]).filter(Boolean);
     if (resolved.length === 0) return void 0;
     return resolved;
-  }, [options.skill]);
+  }, [skillFlag]);
   const chat = ink$1.useChat({
     adapter: runtime.adapter,
     memory,
@@ -277,8 +558,109 @@ function ChatApp(options) {
     tools: tools.length > 0 ? tools : void 0,
     skills
   });
+  const [sessionAllowed, setSessionAllowed] = React3.useState(/* @__PURE__ */ new Set());
+  const autoApprovedRef = React3.useRef(/* @__PURE__ */ new Set());
+  React3.useEffect(() => {
+    if (sessionAllowed.size === 0) return;
+    for (const message of chat.messages) {
+      for (const call of message.toolCalls ?? []) {
+        if (call.status === "requires_confirmation" && sessionAllowed.has(call.name) && !autoApprovedRef.current.has(call.id)) {
+          autoApprovedRef.current.add(call.id);
+          void chat.approve(call.id);
+        }
+      }
+    }
+  }, [chat.messages, sessionAllowed, chat.approve]);
+  const handleApproveAlways = (toolCallId, toolName) => {
+    setSessionAllowed((prev) => {
+      if (prev.has(toolName)) return prev;
+      const next = new Set(prev);
+      next.add(toolName);
+      return next;
+    });
+    autoApprovedRef.current.add(toolCallId);
+    void chat.approve(toolCallId);
+  };
+  const sessionCreatedAtRef = React3.useRef(void 0);
+  const messageCount = chat.messages.length;
+  const firstUserContent = chat.messages.find((m) => m.role === "user")?.content ?? "";
+  React3.useEffect(() => {
+    const sessionId = options.sessionId;
+    if (!sessionId || sessionId === "custom") return;
+    if (!sessionCreatedAtRef.current) {
+      sessionCreatedAtRef.current = (/* @__PURE__ */ new Date()).toISOString();
+    }
+    try {
+      writeSessionMeta({
+        id: sessionId,
+        cwd: process.cwd(),
+        createdAt: sessionCreatedAtRef.current,
+        updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+        messageCount,
+        preview: derivePreview(chat.messages),
+        provider: runtime.provider,
+        model: runtime.model
+      });
+    } catch {
+    }
+  }, [options.sessionId, messageCount, firstUserContent, runtime.provider, runtime.model]);
   const turns = React3.useMemo(() => groupIntoTurns(chat.messages), [chat.messages]);
-  const toolNames = options.tools ? options.tools.split(",").map((s) => s.trim()).filter(Boolean) : [];
+  const toolNames = toolsFlag ? toolsFlag.split(",").map((s) => s.trim()).filter(Boolean) : [];
+  const [feedback, setFeedback] = React3.useState(null);
+  const slashCommands = React3.useMemo(
+    () => [...builtinSlashCommands, ...options.slashCommands ?? []],
+    [options.slashCommands]
+  );
+  const slashRegistry = React3.useMemo(() => createSlashRegistry(slashCommands), [slashCommands]);
+  const handleSubmitInput = async (raw) => {
+    const parsed = parseSlashCommand(raw);
+    if (!parsed) {
+      setFeedback(null);
+      return false;
+    }
+    const cmd = slashRegistry.get(parsed.name);
+    if (!cmd) {
+      setFeedback({
+        message: `Unknown command: /${parsed.name}. Type /help for the list.`,
+        kind: "error"
+      });
+      return true;
+    }
+    const ctx = {
+      chat,
+      runtime: {
+        provider: runtime.provider,
+        model: runtime.model,
+        mode: runtime.mode,
+        baseUrl,
+        tools: toolsFlag,
+        skill: skillFlag
+      },
+      setProvider,
+      setModel,
+      setApiKey,
+      setBaseUrl,
+      setTools: setToolsFlag,
+      setSkill: setSkillFlag,
+      feedback: (message, kind = "info") => setFeedback({ message, kind }),
+      commands: slashCommands
+    };
+    try {
+      await cmd.run(ctx, parsed.args);
+    } catch (err) {
+      const message = err instanceof Error ? err.message : String(err);
+      setFeedback({ message: `/${parsed.name} failed: ${message}`, kind: "error" });
+    }
+    return true;
+  };
+  const awaitingConfirmation = React3.useMemo(
+    () => chat.messages.some(
+      (message) => message.toolCalls?.some(
+        (call) => call.status === "requires_confirmation" && !sessionAllowed.has(call.name)
+      )
+    ),
+    [chat.messages, sessionAllowed]
+  );
   return /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { flexDirection: "column", gap: 1, children: [
     /* @__PURE__ */ jsxRuntime.jsx(
       ink$1.StatusHeader,
@@ -287,7 +669,8 @@ function ChatApp(options) {
         model: runtime.model,
         mode: runtime.mode,
         tools: toolNames,
-        messageCount: chat.messages.length
+        messageCount: chat.messages.length,
+        sessionId: options.sessionId
       }
     ),
     /* @__PURE__ */ jsxRuntime.jsx(ink$1.ChatContainer, { children: turns.map((turn, turnIdx) => {
@@ -304,7 +687,18 @@ function ChatApp(options) {
             assistantSteps
           ] }) : null,
           /* @__PURE__ */ jsxRuntime.jsx(ink$1.Message, { message }),
-          message.toolCalls?.map((toolCall) => /* @__PURE__ */ jsxRuntime.jsx(ink$1.ToolCallView, { toolCall, expanded: true }, toolCall.id))
+          message.toolCalls?.map((toolCall) => /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { flexDirection: "column", children: [
+            /* @__PURE__ */ jsxRuntime.jsx(ink$1.ToolCallView, { toolCall, expanded: true }),
+            toolCall.status === "requires_confirmation" && !sessionAllowed.has(toolCall.name) ? /* @__PURE__ */ jsxRuntime.jsx(
+              ink$1.ToolConfirmation,
+              {
+                toolCall,
+                onApprove: chat.approve,
+                onDeny: chat.deny,
+                onApproveAlways: handleApproveAlways
+              }
+            ) : null
+          ] }, toolCall.id))
         ] }, message.id);
       }) }, `turn-${turnIdx}`);
     }) }),
@@ -315,9 +709,38 @@ function ChatApp(options) {
         label: toolNames.length > 0 ? "agent working" : "thinking"
       }
     ),
-    /* @__PURE__ */ jsxRuntime.jsx(ink$1.InputBar, { chat, placeholder: "Type a message and press Enter\u2026" })
+    chat.error ? /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { borderStyle: "round", borderColor: "red", paddingX: 1, flexDirection: "column", children: [
+      /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { color: "red", bold: true, children: [
+        "\u2717 ",
+        chat.error.name || "Error"
+      ] }),
+      /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { color: "red", children: chat.error.message })
+    ] }) : null,
+    feedback ? /* @__PURE__ */ jsxRuntime.jsx(ink.Box, { borderStyle: "round", borderColor: feedbackBorder(feedback.kind), paddingX: 1, children: /* @__PURE__ */ jsxRuntime.jsx(ink.Text, { color: feedbackBorder(feedback.kind), children: feedback.message }) }) : null,
+    /* @__PURE__ */ jsxRuntime.jsx(
+      ink$1.InputBar,
+      {
+        chat,
+        placeholder: "Type a message or /help for commands",
+        disabled: awaitingConfirmation,
+        onSubmitInput: handleSubmitInput
+      }
+    )
   ] });
 }
+function feedbackBorder(kind) {
+  switch (kind) {
+    case "error":
+      return "red";
+    case "warn":
+      return "yellow";
+    case "success":
+      return "green";
+    case "info":
+    default:
+      return "cyan";
+  }
+}
 function renderChatHeader(options) {
   const runtime = resolveChatProvider(options);
   const parts = [`provider=${runtime.provider}`];
@@ -426,7 +849,7 @@ function reactStarter(ctx) {
   return {
     "package.json": JSON.stringify(
       {
-        name: path__default.default.basename(ctx.template === "react" ? "agentskit-react-app" : "agentskit-app"),
+        name: path3__default.default.basename(ctx.template === "react" ? "agentskit-react-app" : "agentskit-app"),
         private: true,
         type: "module",
         scripts: {
@@ -795,8 +1218,8 @@ async function writeStarterProject(options) {
   await promises.mkdir(options.targetDir, { recursive: true });
   await Promise.all(
     Object.entries(files).map(async ([relativePath, content]) => {
-      const absolutePath = path__default.default.join(options.targetDir, relativePath);
-      await promises.mkdir(path__default.default.dirname(absolutePath), { recursive: true });
+      const absolutePath = path3__default.default.join(options.targetDir, relativePath);
+      await promises.mkdir(path3__default.default.dirname(absolutePath), { recursive: true });
       await promises.writeFile(absolutePath, content, "utf8");
     })
   );
@@ -812,7 +1235,7 @@ ${kleur__default.default.bold().green("\u25B2")} ${kleur__default.default.bold("
       default: defaults.dir ?? "agentskit-app",
       validate: (value) => {
         if (!value.trim()) return "A directory name is required.";
-        const abs = path__default.default.resolve(process.cwd(), value);
+        const abs = path3__default.default.resolve(process.cwd(), value);
         if (fs.existsSync(abs)) return `${value} already exists. Pick a different name.`;
         return true;
       }
@@ -890,7 +1313,7 @@ ${kleur__default.default.bold().green("\u25B2")} ${kleur__default.default.bold("
     return {
       cancelled: false,
       options: {
-        targetDir: path__default.default.resolve(process.cwd(), targetDir),
+        targetDir: path3__default.default.resolve(process.cwd(), targetDir),
         template,
         provider,
         tools,
@@ -907,7 +1330,7 @@ ${kleur__default.default.bold().green("\u25B2")} ${kleur__default.default.bold("
   }
 }
 function printNextSteps(options) {
-  const dir = path__default.default.relative(process.cwd(), options.targetDir) || ".";
+  const dir = path3__default.default.relative(process.cwd(), options.targetDir) || ".";
   const pm = options.packageManager ?? "pnpm";
   const installCmd = pm === "npm" ? "npm install" : `${pm} install`;
   const runCmd = pm === "npm" ? "npm run dev" : `${pm} dev`;
@@ -1121,17 +1544,17 @@ async function checkNodeVersion() {
 }
 async function checkPnpm() {
   const cwd = process.cwd();
-  const hasPnpm = fs.existsSync(path.join(cwd, "pnpm-lock.yaml")) || fs.existsSync(path.join(cwd, "pnpm-workspace.yaml"));
+  const hasPnpm = fs.existsSync(path3.join(cwd, "pnpm-lock.yaml")) || fs.existsSync(path3.join(cwd, "pnpm-workspace.yaml"));
   if (hasPnpm) {
     return { status: "pass", name: "Package manager", detail: "pnpm detected (lockfile)" };
   }
-  if (fs.existsSync(path.join(cwd, "package-lock.json"))) {
+  if (fs.existsSync(path3.join(cwd, "package-lock.json"))) {
     return { status: "warn", name: "Package manager", detail: "npm detected \u2014 pnpm recommended for monorepo workflows" };
   }
-  if (fs.existsSync(path.join(cwd, "yarn.lock"))) {
+  if (fs.existsSync(path3.join(cwd, "yarn.lock"))) {
     return { status: "pass", name: "Package manager", detail: "yarn detected" };
   }
-  if (fs.existsSync(path.join(cwd, "bun.lock")) || fs.existsSync(path.join(cwd, "bun.lockb"))) {
+  if (fs.existsSync(path3.join(cwd, "bun.lock")) || fs.existsSync(path3.join(cwd, "bun.lockb"))) {
     return { status: "pass", name: "Package manager", detail: "bun detected" };
   }
   return {
@@ -1141,7 +1564,7 @@ async function checkPnpm() {
   };
 }
 async function checkPackageJson() {
-  const path4 = path.join(process.cwd(), "package.json");
+  const path4 = path3.join(process.cwd(), "package.json");
   if (!fs.existsSync(path4)) {
     return {
       status: "warn",
@@ -1366,7 +1789,7 @@ var DEFAULT_IGNORE = [
   "**/*.spec.ts"
 ];
 function startDev(options) {
-  const entry = path.resolve(process.cwd(), options.entry);
+  const entry = path3.resolve(process.cwd(), options.entry);
   if (!fs.existsSync(entry)) {
     throw new Error(`Entry file not found: ${entry}`);
   }
@@ -1398,7 +1821,7 @@ function startDev(options) {
   };
   const startChild = () => {
     restartCount++;
-    banner(`\u25B8 starting ${kleur__default.default.bold(path.basename(entry))} (restart #${restartCount - 1})`, "cyan");
+    banner(`\u25B8 starting ${kleur__default.default.bold(path3.basename(entry))} (restart #${restartCount - 1})`, "cyan");
     const c = spawnFn(cmd, baseArgs);
     child = c;
     c.stdout?.on("data", (d) => stdout.write(d));
@@ -1522,34 +1945,87 @@ async function startTunnel(options) {
 // src/commands.ts
 function mergeWithConfig(options, config) {
   if (!config) return options;
+  const d = config.defaults ?? {};
+  const resolvedApiKey = options.apiKey ?? (d.apiKeyEnv ? process.env[d.apiKeyEnv] : void 0) ?? d.apiKey;
   return {
     ...options,
     // Config defaults — only apply if CLI flag wasn't set
-    provider: options.provider !== "demo" ? options.provider : config.defaults?.provider ?? options.provider,
-    model: options.model ?? config.defaults?.model
+    provider: options.provider !== "demo" ? options.provider : d.provider ?? options.provider,
+    model: options.model ?? d.model,
+    apiKey: resolvedApiKey,
+    baseUrl: options.baseUrl ?? d.baseUrl,
+    tools: options.tools ?? d.tools,
+    skill: options.skill ?? d.skill,
+    system: options.system ?? d.system,
+    memoryBackend: options.memoryBackend ?? d.memoryBackend
   };
 }
 function createCli() {
   const program = new commander.Command();
   program.name("agentskit").description("AgentsKit CLI for chat demos and project bootstrapping.");
-  program.command("chat").description("Start a terminal chat session.").option("--provider <provider>", "Provider to use", "demo").option("--model <model>", "Model name").option("--api-key <key>", "API key for the selected provider").option("--base-url <url>", "Override provider base URL").option("--system <prompt>", "System prompt").option("--memory <path>", "Path for file-based memory", ".agentskit-history.json").option("--tools <tools>", "Comma-separated tools: web_search,filesystem,shell").option("--skill <skills>", "Comma-separated skills: researcher,coder,planner,critic,summarizer").option("--memory-backend <backend>", "Memory backend: file (default), sqlite").option("--no-config", "Skip loading .agentskit.config.json").action(async (options) => {
+  program.command("chat").description("Start a terminal chat session.").option("--provider <provider>", "Provider to use", "demo").option("--model <model>", "Model name").option("--api-key <key>", "API key for the selected provider").option("--base-url <url>", "Override provider base URL").option("--system <prompt>", "System prompt").option("--memory <path>", "Explicit memory file path (overrides session management)").option("--tools <tools>", "Comma-separated tools: web_search,fetch_url,filesystem,shell").option("--skill <skills>", "Comma-separated skills: researcher,coder,planner,critic,summarizer").option("--memory-backend <backend>", "Memory backend: file (default), sqlite").option("--new", "Start a fresh chat session (ignore previous conversations in this directory)").option("--resume [id]", "Resume a prior session by id; omit id to resume the latest").option("--list-sessions", "List saved sessions for this directory and exit").option("--no-config", "Skip loading .agentskit.config.json").action(async (options) => {
+    if (options.listSessions) {
+      const sessions = listSessions();
+      if (sessions.length === 0) {
+        process.stdout.write("No saved sessions for this directory.\n");
+        return;
+      }
+      for (const s of sessions) {
+        const { id, updatedAt, messageCount, preview, model } = s.metadata;
+        process.stdout.write(
+          `${id}  ${updatedAt}  msgs=${messageCount}${model ? `  model=${model}` : ""}
+    ${preview}
+`
+        );
+      }
+      return;
+    }
     const config = options.config !== false ? await loadConfig() : void 0;
     const merged = mergeWithConfig(options, config);
+    const session = resolveSession({
+      explicitPath: options.memory,
+      forceNew: Boolean(options.new),
+      resumeId: options.resume
+    });
+    if (!session.isNew && !options.memory) {
+      process.stdout.write(
+        `Resuming session ${session.id}. Start fresh with --new or list with --list-sessions.
+`
+      );
+    }
     const chatOptions = {
       apiKey: merged.apiKey ?? options.apiKey,
       baseUrl: merged.baseUrl ?? options.baseUrl,
       provider: merged.provider,
       model: merged.model,
-      system: options.system,
-      memoryPath: options.memory,
-      tools: options.tools,
-      skill: options.skill,
-      memoryBackend: options.memoryBackend,
+      system: merged.system ?? options.system,
+      memoryPath: session.file,
+      sessionId: session.id,
+      tools: merged.tools ?? options.tools,
+      skill: merged.skill ?? options.skill,
+      memoryBackend: merged.memoryBackend ?? options.memoryBackend,
       agentsKitConfig: config
     };
     process.stdout.write(`${renderChatHeader(chatOptions)}
 `);
-    ink.render(React3__default.default.createElement(ChatApp, chatOptions));
+    const instance = ink.render(React3__default.default.createElement(ChatApp, chatOptions));
+    await instance.waitUntilExit();
+    if (options.memory) {
+      process.stdout.write(
+        `
+Session saved to ${session.file}. Resume with --memory ${session.file}
+`
+      );
+    } else {
+      process.stdout.write(
+        `
+Session saved. Resume with:
+  agentskit chat --resume ${session.id}
+Or start fresh with:
+  agentskit chat --new
+`
+      );
+    }
   });
   program.command("run [task]").description("Execute an agent task and output the result.").option("--task <task>", "Task string (alternative to positional argument)").option("--provider <provider>", "Provider to use", "demo").option("--model <model>", "Model name").option("--api-key <key>", "API key for the selected provider").option("--base-url <url>", "Override provider base URL").option("--skill <skill>", "Single skill to use").option("--skills <skills>", "Comma-separated skills (composed together)").option("--tools <tools>", "Comma-separated tools: web_search,filesystem,shell").option("--memory <path>", "Path for memory persistence").option("--memory-backend <backend>", "Memory backend: file (default), sqlite").option("--system-prompt <prompt>", "System prompt").option("--max-steps <steps>", "Maximum agent steps", "10").option("--verbose", "Stream agent steps to stderr").option("--pretty", "Use rich Ink-based output").option("--no-config", "Skip loading .agentskit.config.json").action(async (positionalTask, options) => {
     const task = options.task ?? positionalTask;
@@ -1577,7 +2053,7 @@ function createCli() {
     if (isCi) {
       const template = rawOptions.template ?? "react";
       resolved = {
-        targetDir: path__default.default.resolve(process.cwd(), rawOptions.dir),
+        targetDir: path3__default.default.resolve(process.cwd(), rawOptions.dir),
         template,
         provider: rawOptions.provider ?? "demo",
         tools: rawOptions.tools ? rawOptions.tools.split(",").map((t) => t.trim()) : [],
@@ -1597,7 +2073,7 @@ function createCli() {
     await writeStarterProject(resolved);
     if (isCi) {
       process.stdout.write(
-        `Created ${resolved.template} starter in ${path__default.default.relative(process.cwd(), resolved.targetDir) || "."}
+        `Created ${resolved.template} starter in ${path3__default.default.relative(process.cwd(), resolved.targetDir) || "."}
 `
       );
     } else {
@@ -1638,6 +2114,43 @@ function createCli() {
       process.exit(1);
     }
   });
+  program.command("config").description("Show or scaffold the AgentsKit config.").argument("[action]", 'Action: "init" to create a template, "show" to print the merged config.', "show").option("--global", "Write/read the global config at ~/.agentskit/config.json (default)").option("--local", "Write/read a project-level .agentskit.config.json in the current directory").option("--force", "Overwrite an existing config file").action(async (action, options) => {
+    const isLocal = Boolean(options.local);
+    const targetPath = isLocal ? path3__default.default.join(process.cwd(), ".agentskit.config.json") : path3__default.default.join(os.homedir(), ".agentskit", "config.json");
+    if (action === "show") {
+      const config = await loadConfig();
+      process.stdout.write(JSON.stringify(config ?? {}, null, 2) + "\n");
+      return;
+    }
+    if (action !== "init") {
+      process.stderr.write(`Unknown action: ${action}. Use "init" or "show".
+`);
+      process.exit(2);
+    }
+    if (fs.existsSync(targetPath) && !options.force) {
+      process.stderr.write(`Config already exists at ${targetPath}. Re-run with --force to overwrite.
+`);
+      process.exit(1);
+    }
+    const template = {
+      defaults: {
+        provider: "openai",
+        baseUrl: "https://openrouter.ai/api",
+        apiKeyEnv: "OPENROUTER_API_KEY",
+        model: "openai/gpt-oss-120b:free",
+        tools: "web_search,fetch_url"
+      }
+    };
+    fs.mkdirSync(path3__default.default.dirname(targetPath), { recursive: true });
+    fs.writeFileSync(targetPath, JSON.stringify(template, null, 2) + "\n");
+    process.stdout.write(
+      `Wrote ${targetPath}
+Edit it to taste, then run:
+  agentskit chat
+(flags on the CLI still win over config values.)
+`
+    );
+  });
   program.command("tunnel <port>").description("Open a public URL pointing to a local port (great for webhooks).").option("--subdomain <name>", "Hint for a stable subdomain (provider may decline)").option("--host <host>", "Local hostname", "localhost").action(async (port, options) => {
     const portNum = Number(port);
     if (Number.isNaN(portNum) || portNum < 1 || portNum > 65535) {