@buzzni/saycode-cli 0.1.4 → 0.1.5

package/README.md

@@ -126,6 +126,11 @@ saycode chat -p <프로젝트> --voice-file ./prompt.wav
 프롬프트에 쌓이지 않습니다. 권한 요청 때만 `◆ Action required — permission response only`로 바뀌고
 해당 선택 입력을 받습니다. 에이전트 턴이 끝나 `Ready`가 표시된 뒤에만 일반 프롬프트가 열립니다.
 
+이전 답변을 보려면 터미널 scrollback 단축키인 **`Shift+Page Up/Down`**을 사용합니다. Mac 노트북
+키보드에서는 **`Shift+Fn+↑/↓`**입니다. `Page Up`만 누르면 readline/raw 입력으로 전달될 수 있어
+스크롤되지 않습니다. CLI는 터미널의 기존 scrollback·복사·검색을 보존하기 위해 alternate screen을
+사용하지 않습니다.
+
 에이전트가 작업 중일 때 **`Ctrl+C`를 누르면 선택지가 뜹니다.**
 한 글자만 누르면 됩니다 (Enter 불필요). `Ctrl+C`를 한 번 더 누르면 `d`와 같습니다 —
 반복해서 누르는 건 "빨리 나가자"는 뜻이고, 나가는 건 되돌릴 수 있지만 작업을 죽이는 건
@@ -139,6 +144,8 @@ saycode chat -p <프로젝트> --voice-file ./prompt.wav
 | `Ctrl+C` (유휴 중) | CLI를 종료합니다 |
 | `/detach` | 프롬프트에서 치는 `d`의 별칭 |
 | `/exit` | 대화를 떠납니다 (탐색기에서 왔다면 탐색기로 복귀) |
+| `/model` | 다음 메시지부터 사용할 모델을 선택합니다 |
+| `/effort` | 현재 모델의 effort를 다음 메시지부터 변경합니다 |
 | `/voice` | 마이크로 다음 프롬프트를 녹음·전사합니다 |
 | `/voice <audio-path>` | 기존 음성 파일을 다음 프롬프트로 전사합니다 |
 
@@ -179,11 +186,11 @@ GitHub Actions 가 태그로 발행합니다 (`.github/workflows/publish-saycode
 
 ```bash
 # 1. 버전 올리기 — 데스크탑 앱 버전과 무관합니다
-vi cli/manifest.json          # "version": "0.1.4"
+vi cli/manifest.json          # "version": "0.1.5"
 
 # 2. 커밋하고 태그를 밀면 끝
-git tag -a saycode-cli-v0.1.4 -m "Release saycode-cli 0.1.4"
-git push origin saycode-cli-v0.1.4
+git tag -a saycode-cli-v0.1.5 -m "Release saycode-cli 0.1.5"
+git push origin saycode-cli-v0.1.5
 ```
 
 워크플로는 발행 전에 이 순서로 막습니다:

package/index.mjs

@@ -19,7 +19,7 @@ import require$$4$1 from "tls";
 import require$$0$5 from "stream";
 import require$$0$3 from "zlib";
 import { readFile, stat, mkdtemp, access, rm, mkdir, appendFile, writeFile } from "node:fs/promises";
-import { spawn } from "node:child_process";
+import { execFile, spawn } from "node:child_process";
 import { randomUUID } from "node:crypto";
 function _mergeNamespaces(n, m) {
   for (var i = 0; i < m.length; i++) {
@@ -40,7 +40,7 @@ function _mergeNamespaces(n, m) {
   }
   return Object.freeze(Object.defineProperty(n, Symbol.toStringTag, { value: "Module" }));
 }
-const version = "0.1.4";
+const version = "0.1.5";
 const manifest = {
   version
 };
@@ -294,9 +294,8 @@ In a chat
                                  [Enter] keep watching
                                  [d]     detach — the agent keeps working
                                  [s]     stop the response
-  Ctrl+C (while idle)            leave the CLI
-  /detach                        same as [d], typed at the prompt
-  /exit                          leave the chat
+  Ctrl+C idle: leave             Shift+Page Up/Down: scroll (Mac: Shift+Fn+↑/↓)
+  /model · /effort · /voice [path] · /detach · /exit  live chat commands
 
 Leaving never stops a remote session — it keeps running on the machine.`;
 function getDefaultExportFromCjs(x) {
@@ -2802,6 +2801,26 @@ function coerceSessionModels(raw) {
   }
   return out.length ? out : void 0;
 }
+function dedupeByKey(options) {
+  const seen = /* @__PURE__ */ new Set();
+  const out = [];
+  for (const option of options) {
+    if (seen.has(option.key)) continue;
+    seen.add(option.key);
+    out.push(option);
+  }
+  return out;
+}
+function buildOpencodeModelOptions(models) {
+  const options = [{ key: DEFAULT_MODEL_KEY, label: "Default" }];
+  if (Array.isArray(models)) {
+    for (const model of models) {
+      if (!model || typeof model.code !== "string" || !model.code) continue;
+      options.push({ key: model.code, label: model.value || model.code });
+    }
+  }
+  return dedupeByKey(options);
+}
 function hasModelCode(models, code) {
   return Array.isArray(models) && models.some((model) => model?.code === code);
 }
@@ -2809,6 +2828,10 @@ function normalizeOpencodeModel(selected, models) {
   if (!selected || selected === DEFAULT_MODEL_KEY) return DEFAULT_MODEL_KEY;
   return hasModelCode(models, selected) ? selected : DEFAULT_MODEL_KEY;
 }
+function resolveOpencodeCurrentModel(currentModelCode, models) {
+  if (currentModelCode && hasModelCode(models, currentModelCode)) return currentModelCode;
+  return DEFAULT_MODEL_KEY;
+}
 const MAX_MAPPING_COUNT = 1e3;
 function buildProjectConversationsPath(projectId) {
   const trimmed = projectId.trim();
@@ -24382,6 +24405,38 @@ function interruptMenuChoice(key) {
   if (first === "s") return "stop";
   return "watch";
 }
+class ChatSession {
+  state = createChatState();
+  waiters = [];
+  detached = false;
+  get current() {
+    return this.state;
+  }
+  get isDetached() {
+    return this.detached;
+  }
+  detach() {
+    this.detached = true;
+    this.wakeAll();
+  }
+  wakeAll() {
+    const waiting = this.waiters;
+    this.waiters = [];
+    for (const wake of waiting) wake();
+  }
+  apply(event) {
+    const next = reduceChatState(this.state, event);
+    if (next === this.state) return;
+    this.state = next;
+    this.wakeAll();
+  }
+  async waitForAttention() {
+    while (this.state.phase === "responding" && !this.detached) {
+      await new Promise((resolve) => this.waiters.push(resolve));
+    }
+    return this.state;
+  }
+}
 function chatPresentation(state) {
   if (state.phase === "idle") {
     return {
@@ -24403,6 +24458,213 @@ function chatPresentation(state) {
     prompt: null
   };
 }
+function chatStartupHints() {
+  return [
+    "During a response, typing is locked. Ctrl+C opens response options.",
+    "Scroll history: Shift+Page Up/Down · Mac laptops: Shift+Fn+↑/↓.",
+    "At the prompt: /model · /effort · /voice to dictate · /detach to leave running · /exit to leave.\n"
+  ];
+}
+const claudeEffortOptions = [
+  { key: "low", label: "Low" },
+  { key: "medium", label: "Medium" },
+  { key: "high", label: "High" },
+  { key: "max", label: "Max" }
+];
+const claudeFableEffortOptions = [
+  { key: "low", label: "Low" },
+  { key: "medium", label: "Medium" },
+  { key: "high", label: "High" },
+  { key: "xhigh", label: "Xhigh" },
+  { key: "max", label: "Max" }
+];
+const codexEffortOptions = [
+  { key: "low", label: "Low" },
+  { key: "medium", label: "Medium" },
+  { key: "high", label: "High" },
+  { key: "xhigh", label: "Xhigh" }
+];
+const codexMaxEffortOptions = [
+  ...codexEffortOptions,
+  { key: "max", label: "Max" }
+];
+const codexUltraEffortOptions = [
+  ...codexMaxEffortOptions,
+  { key: "ultra", label: "Ultra" }
+];
+function getEffortOptionsForAgent(agent, model) {
+  if (model === "default") return [];
+  if (agent === "codex") {
+    if (model === "gpt-5.6-sol" || model === "gpt-5.6-terra") return codexUltraEffortOptions;
+    if (model === "gpt-5.6-luna") return codexMaxEffortOptions;
+    return codexEffortOptions;
+  }
+  if (agent === "gemini" || agent === "opencode") return [];
+  if (model === "claude-fable-5") return claudeFableEffortOptions;
+  return claudeEffortOptions;
+}
+function defaultEffortForAgent(agent, model) {
+  const options = getEffortOptionsForAgent(agent, model);
+  if (options.length === 0) return null;
+  if (agent === "codex") {
+    if (model === "gpt-5.6-sol") return "low";
+    if (model === "gpt-5.6-terra" || model === "gpt-5.6-luna") return "medium";
+  }
+  return options.some((option) => option.key === "high") ? "high" : options[options.length - 1].key;
+}
+const newSessionAgents = [
+  { id: "claude", label: "Claude", provider: "Anthropic" },
+  { id: "codex", label: "Codex", provider: "OpenAI" },
+  { id: "opencode", label: "opencode", provider: "opencode" }
+];
+const claudeModelOptions = [
+  { key: "default", label: "Default" },
+  { key: "claude-fable-5", label: "Fable 5" },
+  { key: "claude-opus-5", label: "Opus 5" },
+  { key: "claude-sonnet-5", label: "Sonnet 5" },
+  { key: "claude-haiku-4-5", label: "Haiku 4.5" }
+];
+const codexModelOptions = [
+  { key: "default", label: "Default" },
+  { key: "gpt-5.6-sol", label: "GPT-5.6 Sol" },
+  { key: "gpt-5.6-terra", label: "GPT-5.6 Terra" },
+  { key: "gpt-5.6-luna", label: "GPT-5.6 Luna" },
+  { key: "gpt-5.5", label: "gpt-5.5" },
+  { key: "gpt-5.4", label: "gpt-5.4" },
+  { key: "gpt-5.3-codex", label: "gpt-5.3-codex" },
+  { key: "gpt-5.2-codex", label: "gpt-5.2-codex" },
+  { key: "gpt-5.1-codex-max", label: "gpt-5.1-codex-max" },
+  { key: "gpt-5.2", label: "gpt-5.2" },
+  { key: "gpt-5.1-codex-mini", label: "gpt-5.1-codex-mini" }
+];
+const geminiModelOptions = [
+  { key: "gemini-3.1-pro-preview", label: "gemini 3.1 pro" },
+  { key: "gemini-3-flash-preview", label: "gemini 3 flash" },
+  { key: "gemini-3.1-flash-lite-preview", label: "gemini 3.1 flash lite" },
+  { key: "gemini-2.5-pro", label: "gemini 2.5 pro" },
+  { key: "gemini-2.5-flash", label: "gemini 2.5 flash" },
+  { key: "gemini-2.5-flash-lite", label: "gemini 2.5 flash lite" }
+];
+const opencodeModelOptions = [
+  { key: "default", label: "Default" }
+];
+function getModelsForAgent(agent) {
+  if (agent === "codex") return codexModelOptions;
+  if (agent === "gemini") return geminiModelOptions;
+  if (agent === "opencode") return opencodeModelOptions;
+  return claudeModelOptions;
+}
+function normalizeModelForAgent(agent, model) {
+  if (agent === "opencode") return model || "default";
+  const models = getModelsForAgent(agent);
+  return models.some((option) => option.key === model) ? model : models[0]?.key ?? "default";
+}
+function normalizeModelSelectionOptions(agent, current, patch) {
+  const model = normalizeModelForAgent(agent, patch.model ?? current.model);
+  const efforts = getEffortOptionsForAgent(agent, model);
+  const effort = patch.model !== void 0 ? defaultEffortForAgent(agent, model) : patch.effort !== void 0 && efforts.some((option) => option.key === patch.effort) ? patch.effort : current.effort && efforts.some((option) => option.key === current.effort) ? current.effort : defaultEffortForAgent(agent, model);
+  return { model, effort };
+}
+function messageModelOptionsFromSelection(agent, options, availableModels) {
+  if (agent === "opencode") {
+    const model = normalizeOpencodeModel(options.model, availableModels);
+    return { model: model !== "default" ? model : void 0, effort: null };
+  }
+  const normalized = normalizeModelSelectionOptions(agent, options, {});
+  return {
+    model: normalized.model !== "default" ? normalized.model : void 0,
+    effort: normalized.effort
+  };
+}
+function configurableAgent$1(value2) {
+  return value2 === "claude" || value2 === "codex" || value2 === "gemini" || value2 === "opencode" ? value2 : null;
+}
+function createLiveChatSettings(input) {
+  const agent = configurableAgent$1(input.agent);
+  const models = [...input.models ?? []];
+  if (!agent) return { agent: null, model: "default", effort: null, models };
+  if (agent === "opencode") {
+    const requested = input.model ?? resolveOpencodeCurrentModel(input.currentModelCode ?? void 0, models);
+    return { agent, model: normalizeOpencodeModel(requested, models), effort: null, models };
+  }
+  let selection = normalizeModelSelectionOptions(
+    agent,
+    { model: "default", effort: null },
+    { model: input.model ?? "default" }
+  );
+  if (input.effort) selection = normalizeModelSelectionOptions(agent, selection, { effort: input.effort });
+  return { agent, ...selection, models };
+}
+function liveChatModelChoices(settings) {
+  if (!settings.agent) return [];
+  if (settings.agent === "opencode") return buildOpencodeModelOptions(settings.models);
+  return getModelsForAgent(settings.agent);
+}
+function liveChatEffortChoices(settings) {
+  if (!settings.agent) return [];
+  return getEffortOptionsForAgent(settings.agent, settings.model);
+}
+function updateLiveChatSettings(current, patch) {
+  if (!current.agent) return current;
+  if (current.agent === "opencode") {
+    if (patch.model === void 0) return current;
+    return { ...current, model: normalizeOpencodeModel(patch.model, current.models), effort: null };
+  }
+  let selection = { model: current.model, effort: current.effort };
+  if (patch.model !== void 0) {
+    if (!liveChatModelChoices(current).some((option) => option.key === patch.model)) return current;
+    selection = normalizeModelSelectionOptions(current.agent, selection, { model: patch.model });
+  }
+  if (patch.effort !== void 0) {
+    const efforts = getEffortOptionsForAgent(current.agent, selection.model);
+    if (patch.effort !== null && !efforts.some((option) => option.key === patch.effort)) return current;
+    selection = {
+      ...selection,
+      effort: patch.effort ?? defaultEffortForAgent(current.agent, selection.model)
+    };
+  }
+  return { ...current, ...selection };
+}
+function observeLiveChatMessage(current, content) {
+  if (content.role !== "user") return current;
+  const model = typeof content.meta?.model === "string" ? content.meta.model : "default";
+  const effort = typeof content.meta?.effort === "string" ? content.meta.effort : null;
+  return updateLiveChatSettings(current, { model, effort });
+}
+function buildLiveChatUserMessage(text2, settings) {
+  const modelOptions = settings.agent ? messageModelOptionsFromSelection(settings.agent, settings, settings.models) : {};
+  return {
+    role: "user",
+    content: { type: "text", text: text2 },
+    meta: {
+      permissionMode: "default",
+      ...modelOptions.model ? { model: modelOptions.model } : {},
+      ...modelOptions.effort ? { effort: modelOptions.effort } : {}
+    }
+  };
+}
+function liveChatSettingsFromSessionRows(rows, sessionId, candidateKeys, fallbackAgent) {
+  const row = rows.find((entry) => entry.id === sessionId);
+  const metadata = decryptJsonWithCandidates(row?.metadata, candidateKeys);
+  const agent = agentFromFlavor(typeof metadata?.flavor === "string" ? metadata.flavor : void 0) ?? fallbackAgent;
+  const models = coerceSessionModels(metadata?.models) ?? [];
+  return createLiveChatSettings({
+    agent,
+    models,
+    currentModelCode: typeof metadata?.currentModelCode === "string" ? metadata.currentModelCode : null
+  });
+}
+function needsLiveChatModelRefresh(settings) {
+  return settings.agent === "opencode" && settings.models.length === 0;
+}
+function refreshLiveChatModelsFromSessionRows(current, rows, sessionId, candidateKeys) {
+  if (!needsLiveChatModelRefresh(current)) return current;
+  const row = rows.find((entry) => entry.id === sessionId);
+  const metadata = decryptJsonWithCandidates(row?.metadata, candidateKeys);
+  const models = coerceSessionModels(metadata?.models);
+  if (!models?.length) return current;
+  return createLiveChatSettings({ ...current, models });
+}
 function describePermissionRequest(request) {
   const summary = summarizeToolArgs(request.arguments ?? {});
   if (summary) return `${request.toolName}(${summary})`;
@@ -24775,116 +25037,11 @@ async function runProjectConversations(context, query, all) {
 ! Some conversations could not be resolved${payload.warnings.length ? `: ${payload.warnings.join(", ")}` : "."}`);
   }
 }
-const claudeEffortOptions = [
-  { key: "low", label: "Low" },
-  { key: "medium", label: "Medium" },
-  { key: "high", label: "High" },
-  { key: "max", label: "Max" }
-];
-const claudeFableEffortOptions = [
-  { key: "low", label: "Low" },
-  { key: "medium", label: "Medium" },
-  { key: "high", label: "High" },
-  { key: "xhigh", label: "Xhigh" },
-  { key: "max", label: "Max" }
-];
-const codexEffortOptions = [
-  { key: "low", label: "Low" },
-  { key: "medium", label: "Medium" },
-  { key: "high", label: "High" },
-  { key: "xhigh", label: "Xhigh" }
-];
-const codexMaxEffortOptions = [
-  ...codexEffortOptions,
-  { key: "max", label: "Max" }
-];
-const codexUltraEffortOptions = [
-  ...codexMaxEffortOptions,
-  { key: "ultra", label: "Ultra" }
-];
-function getEffortOptionsForAgent(agent, model) {
-  if (model === "default") return [];
-  if (agent === "codex") {
-    if (model === "gpt-5.6-sol" || model === "gpt-5.6-terra") return codexUltraEffortOptions;
-    if (model === "gpt-5.6-luna") return codexMaxEffortOptions;
-    return codexEffortOptions;
-  }
-  if (agent === "gemini" || agent === "opencode") return [];
-  if (model === "claude-fable-5") return claudeFableEffortOptions;
-  return claudeEffortOptions;
-}
-function defaultEffortForAgent(agent, model) {
-  const options = getEffortOptionsForAgent(agent, model);
-  if (options.length === 0) return null;
-  if (agent === "codex") {
-    if (model === "gpt-5.6-sol") return "low";
-    if (model === "gpt-5.6-terra" || model === "gpt-5.6-luna") return "medium";
-  }
-  return options.some((option) => option.key === "high") ? "high" : options[options.length - 1].key;
-}
-const newSessionAgents = [
-  { id: "claude", label: "Claude", provider: "Anthropic" },
-  { id: "codex", label: "Codex", provider: "OpenAI" },
-  { id: "opencode", label: "opencode", provider: "opencode" }
-];
-const claudeModelOptions = [
-  { key: "default", label: "Default" },
-  { key: "claude-fable-5", label: "Fable 5" },
-  { key: "claude-opus-5", label: "Opus 5" },
-  { key: "claude-sonnet-5", label: "Sonnet 5" },
-  { key: "claude-haiku-4-5", label: "Haiku 4.5" }
-];
-const codexModelOptions = [
-  { key: "default", label: "Default" },
-  { key: "gpt-5.6-sol", label: "GPT-5.6 Sol" },
-  { key: "gpt-5.6-terra", label: "GPT-5.6 Terra" },
-  { key: "gpt-5.6-luna", label: "GPT-5.6 Luna" },
-  { key: "gpt-5.5", label: "gpt-5.5" },
-  { key: "gpt-5.4", label: "gpt-5.4" },
-  { key: "gpt-5.3-codex", label: "gpt-5.3-codex" },
-  { key: "gpt-5.2-codex", label: "gpt-5.2-codex" },
-  { key: "gpt-5.1-codex-max", label: "gpt-5.1-codex-max" },
-  { key: "gpt-5.2", label: "gpt-5.2" },
-  { key: "gpt-5.1-codex-mini", label: "gpt-5.1-codex-mini" }
-];
-const geminiModelOptions = [
-  { key: "gemini-3.1-pro-preview", label: "gemini 3.1 pro" },
-  { key: "gemini-3-flash-preview", label: "gemini 3 flash" },
-  { key: "gemini-3.1-flash-lite-preview", label: "gemini 3.1 flash lite" },
-  { key: "gemini-2.5-pro", label: "gemini 2.5 pro" },
-  { key: "gemini-2.5-flash", label: "gemini 2.5 flash" },
-  { key: "gemini-2.5-flash-lite", label: "gemini 2.5 flash lite" }
-];
-const opencodeModelOptions = [
-  { key: "default", label: "Default" }
-];
-function getModelsForAgent(agent) {
-  if (agent === "codex") return codexModelOptions;
-  if (agent === "gemini") return geminiModelOptions;
-  if (agent === "opencode") return opencodeModelOptions;
-  return claudeModelOptions;
-}
-function normalizeModelForAgent(agent, model) {
-  if (agent === "opencode") return model || "default";
-  const models = getModelsForAgent(agent);
-  return models.some((option) => option.key === model) ? model : models[0]?.key ?? "default";
-}
-function normalizeModelSelectionOptions(agent, current, patch) {
-  const model = normalizeModelForAgent(agent, patch.model ?? current.model);
-  const efforts = getEffortOptionsForAgent(agent, model);
-  const effort = patch.model !== void 0 ? defaultEffortForAgent(agent, model) : patch.effort !== void 0 && efforts.some((option) => option.key === patch.effort) ? patch.effort : current.effort && efforts.some((option) => option.key === current.effort) ? current.effort : defaultEffortForAgent(agent, model);
-  return { model, effort };
-}
-function messageModelOptionsFromSelection(agent, options, availableModels) {
-  if (agent === "opencode") {
-    const model = normalizeOpencodeModel(options.model, availableModels);
-    return { model: model !== "default" ? model : void 0, effort: null };
-  }
-  const normalized = normalizeModelSelectionOptions(agent, options, {});
-  return {
-    model: normalized.model !== "default" ? normalized.model : void 0,
-    effort: normalized.effort
-  };
+function worktreeTargetMismatch(record2, expected) {
+  if (record2.projectId !== expected.projectId) return "project";
+  if (record2.machineId !== expected.machineId) return "machine";
+  if (expected.path !== void 0 && record2.path !== expected.path) return "path";
+  return null;
 }
 const WORKTREE_NAME_ADJECTIVES = [
   "bright",
@@ -24946,63 +25103,6 @@ function isWorktreePathWithinProjectRoot(projectRoot, worktreePath) {
   if (segments.length < 1 || segments.length > MAX_MANAGED_WORKTREE_DEPTH) return false;
   return segments.every((segment) => segment.length > 0 && segment !== "." && segment !== "..");
 }
-const DEFAULT_CLI_NEW_CONVERSATION_OPTIONS = {
-  agent: "claude",
-  model: "default",
-  effort: null,
-  useWorktree: false,
-  worktreeName: "",
-  worktreeBaseRef: "HEAD",
-  files: [],
-  voice: false,
-  voiceFile: null
-};
-function normalizeNewConversationOptions(current, patch) {
-  const agent = patch.agent ?? current.agent;
-  const agentChanged = patch.agent !== void 0 && patch.agent !== current.agent;
-  const currentSelection = agentChanged ? { model: "default", effort: null } : { model: current.model, effort: current.effort };
-  const modelSelection = normalizeModelSelectionOptions(agent, currentSelection, {
-    ...patch.model !== void 0 ? { model: patch.model } : {}
-  });
-  const efforts = getEffortOptionsForAgent(agent, modelSelection.model);
-  const requestedEffort = patch.effort !== void 0 ? patch.effort : modelSelection.effort;
-  const effort = requestedEffort && efforts.some((option) => option.key === requestedEffort) ? requestedEffort : defaultEffortForAgent(agent, modelSelection.model);
-  return {
-    agent,
-    model: modelSelection.model,
-    effort,
-    useWorktree: patch.useWorktree ?? current.useWorktree,
-    worktreeName: patch.worktreeName !== void 0 ? sanitizeWorktreeName(patch.worktreeName) : current.worktreeName,
-    worktreeBaseRef: (patch.worktreeBaseRef ?? current.worktreeBaseRef).trim() || "HEAD",
-    files: patch.files ? [...patch.files] : [...current.files],
-    voice: patch.voice ?? current.voice,
-    voiceFile: patch.voiceFile !== void 0 ? patch.voiceFile : current.voiceFile
-  };
-}
-function buildCliUserMessage(text2, options) {
-  const modelOptions = messageModelOptionsFromSelection(options.agent, options);
-  return {
-    role: "user",
-    content: { type: "text", text: text2 },
-    meta: {
-      permissionMode: "default",
-      ...modelOptions.model ? { model: modelOptions.model } : {},
-      ...modelOptions.effort ? { effort: modelOptions.effort } : {}
-    }
-  };
-}
-function modelChoices(agent) {
-  return getModelsForAgent(agent);
-}
-function effortChoices(agent, model) {
-  return getEffortOptionsForAgent(agent, normalizeModelForAgent(agent, model));
-}
-function worktreeTargetMismatch(record2, expected) {
-  if (record2.projectId !== expected.projectId) return "project";
-  if (record2.machineId !== expected.machineId) return "machine";
-  if (expected.path !== void 0 && record2.path !== expected.path) return "path";
-  return null;
-}
 async function createWorktreeOnMachine(input) {
   const record2 = await input.client.createProjectWorktree(input.projectId, {
     name: input.name,
@@ -25187,6 +25287,45 @@ function uploadCliAttachment(transport, machineId, workspaceRoot, file, determin
 function prepareCliMessageWithAttachments(text2, files, uploadFile) {
   return preparePersonalChatMessageWithAttachments({ text: text2, files }, { uploadFile });
 }
+const DEFAULT_CLI_NEW_CONVERSATION_OPTIONS = {
+  agent: "claude",
+  model: "default",
+  effort: null,
+  useWorktree: false,
+  worktreeName: "",
+  worktreeBaseRef: "HEAD",
+  files: [],
+  voice: false,
+  voiceFile: null
+};
+function normalizeNewConversationOptions(current, patch) {
+  const agent = patch.agent ?? current.agent;
+  const agentChanged = patch.agent !== void 0 && patch.agent !== current.agent;
+  const currentSelection = agentChanged ? { model: "default", effort: null } : { model: current.model, effort: current.effort };
+  const modelSelection = normalizeModelSelectionOptions(agent, currentSelection, {
+    ...patch.model !== void 0 ? { model: patch.model } : {}
+  });
+  const efforts = getEffortOptionsForAgent(agent, modelSelection.model);
+  const requestedEffort = patch.effort !== void 0 ? patch.effort : modelSelection.effort;
+  const effort = requestedEffort && efforts.some((option) => option.key === requestedEffort) ? requestedEffort : defaultEffortForAgent(agent, modelSelection.model);
+  return {
+    agent,
+    model: modelSelection.model,
+    effort,
+    useWorktree: patch.useWorktree ?? current.useWorktree,
+    worktreeName: patch.worktreeName !== void 0 ? sanitizeWorktreeName(patch.worktreeName) : current.worktreeName,
+    worktreeBaseRef: (patch.worktreeBaseRef ?? current.worktreeBaseRef).trim() || "HEAD",
+    files: patch.files ? [...patch.files] : [...current.files],
+    voice: patch.voice ?? current.voice,
+    voiceFile: patch.voiceFile !== void 0 ? patch.voiceFile : current.voiceFile
+  };
+}
+function modelChoices(agent) {
+  return getModelsForAgent(agent);
+}
+function effortChoices(agent, model) {
+  return getEffortOptionsForAgent(agent, normalizeModelForAgent(agent, model));
+}
 function choiceIndex(answer, length, currentIndex) {
   const trimmed = answer?.trim() ?? "";
   if (!trimmed) return Math.max(0, currentIndex);
@@ -25250,26 +25389,87 @@ function resolveTranscriptionOutcome(text2) {
   if (!cleaned) return { errorKind: "no-speech" };
   return { transcript: cleaned };
 }
-function recorderSpec(platform2, available) {
+function findDefaultInput(value2) {
+  if (Array.isArray(value2)) {
+    for (const entry of value2) {
+      const found = findDefaultInput(entry);
+      if (found) return found;
+    }
+    return null;
+  }
+  if (!value2 || typeof value2 !== "object") return null;
+  const record2 = value2;
+  if (record2.coreaudio_default_audio_input_device === "spaudio_yes") {
+    return typeof record2._name === "string" ? record2._name : null;
+  }
+  return findDefaultInput(Object.values(record2));
+}
+function defaultMacAudioInput(profile) {
+  return findDefaultInput(profile);
+}
+async function lookupMacAudioInput() {
+  return new Promise((resolve) => {
+    execFile(
+      "/usr/sbin/system_profiler",
+      ["SPAudioDataType", "-json"],
+      { encoding: "utf8", timeout: 5e3 },
+      (error, stdout) => {
+        if (error) {
+          resolve(null);
+          return;
+        }
+        try {
+          resolve(defaultMacAudioInput(JSON.parse(stdout)));
+        } catch {
+          resolve(null);
+        }
+      }
+    );
+  });
+}
+function createMacAudioInputResolver(lookup2 = lookupMacAudioInput) {
+  let cached = null;
+  return () => {
+    cached ??= lookup2().catch(() => null);
+    return cached;
+  };
+}
+const resolveMacAudioInput = createMacAudioInputResolver();
+function ffmpegRecorderSpec(platform2, macInput) {
+  if (platform2 === "darwin") {
+    return {
+      command: "ffmpeg",
+      args: (path) => ["-nostdin", "-loglevel", "error", "-f", "avfoundation", "-i", `:${macInput}`, "-ac", "1", "-ar", "16000", "-y", path]
+    };
+  }
+  return {
+    command: "ffmpeg",
+    args: (path) => ["-nostdin", "-loglevel", "error", "-f", "pulse", "-i", "default", "-ac", "1", "-ar", "16000", "-y", path]
+  };
+}
+function recorderSpecs(platform2, available, macInput = "0") {
   if (platform2 === "linux" && available.has("arecord")) {
-    return { command: "arecord", args: (path) => ["-q", "-f", "S16_LE", "-r", "16000", "-c", "1", path] };
+    return [{ command: "arecord", args: (path) => ["-q", "-f", "S16_LE", "-r", "16000", "-c", "1", path] }];
   }
   if (available.has("rec")) {
-    return { command: "rec", args: (path) => ["-q", "-c", "1", "-r", "16000", path] };
+    return [{ command: "rec", args: (path) => ["-q", "-c", "1", "-r", "16000", path] }];
   }
   if (available.has("ffmpeg")) {
-    if (platform2 === "darwin") {
-      return {
-        command: "ffmpeg",
-        args: (path) => ["-nostdin", "-loglevel", "error", "-f", "avfoundation", "-i", ":0", "-ac", "1", "-ar", "16000", "-y", path]
-      };
+    const preferred = ffmpegRecorderSpec(platform2, macInput);
+    return platform2 === "darwin" && macInput !== "0" ? [preferred, ffmpegRecorderSpec(platform2, "0")] : [preferred];
+  }
+  return [];
+}
+async function startRecorderWithFallback(specs, start) {
+  let lastError = new Error("No recorder candidate was provided.");
+  for (const spec of specs) {
+    try {
+      return await start(spec);
+    } catch (error) {
+      lastError = error;
     }
-    return {
-      command: "ffmpeg",
-      args: (path) => ["-nostdin", "-loglevel", "error", "-f", "pulse", "-i", "default", "-ac", "1", "-ar", "16000", "-y", path]
-    };
   }
-  return null;
+  throw lastError;
 }
 async function installedCommands(env) {
   const result = /* @__PURE__ */ new Set();
@@ -25304,6 +25504,41 @@ function waitForSpawn(child) {
     child.once("error", onError);
   });
 }
+function waitForRecorderStartup(child) {
+  return new Promise((resolve, reject) => {
+    if (child.exitCode !== null || child.signalCode !== null) {
+      reject(new Error(`Recorder exited during startup (${child.exitCode ?? child.signalCode}).`));
+      return;
+    }
+    let stderr = "";
+    const timer = setTimeout(() => finish(), 300);
+    const finish = (error) => {
+      clearTimeout(timer);
+      child.stderr?.off("data", onData);
+      child.off("close", onClose);
+      child.off("error", onError);
+      if (error) reject(error);
+      else resolve();
+    };
+    const fail = (message) => {
+      child.kill("SIGTERM");
+      finish(new Error(message));
+    };
+    const onData = (chunk) => {
+      stderr = `${stderr}${chunk.toString()}`.slice(-4e3);
+      if (/device not found|failed to create av capture input device|error opening input/i.test(stderr)) {
+        fail(stderr.trim() || "Recorder failed to open its input device.");
+      }
+    };
+    const onClose = (code, signal) => {
+      finish(new Error(stderr.trim() || `Recorder exited during startup (${code ?? signal ?? "unknown"}).`));
+    };
+    const onError = (error) => finish(error);
+    child.stderr?.on("data", onData);
+    child.once("close", onClose);
+    child.once("error", onError);
+  });
+}
 function waitForClose(child) {
   return new Promise((resolve) => {
     if (child.exitCode !== null || child.signalCode !== null) {
@@ -25322,16 +25557,19 @@ function waitForClose(child) {
 }
 async function recordCliVoice(waitForStop, input = {}) {
   const platform2 = input.platform ?? process.platform;
-  const spec = recorderSpec(platform2, await installedCommands(input.env ?? process.env));
-  if (!spec) {
-    throw new Error("No supported microphone recorder was found. Install ffmpeg/SoX/arecord or use `--voice-file <audio>` instead.");
-  }
+  const macInput = platform2 === "darwin" ? await resolveMacAudioInput() : null;
+  const specs = recorderSpecs(platform2, await installedCommands(input.env ?? process.env), macInput ?? "0");
+  if (specs.length === 0) throw new Error("No supported microphone recorder was found. Install ffmpeg/SoX/arecord or use `--voice-file <audio>` instead.");
   const directory = await mkdtemp(join(tmpdir(), "saycode-voice-"));
   const path = join(directory, "prompt.wav");
   const cleanup = () => rm(directory, { recursive: true, force: true });
   try {
-    const child = spawn(spec.command, spec.args(path), { stdio: ["ignore", "ignore", "pipe"] });
-    await waitForSpawn(child);
+    const child = await startRecorderWithFallback(specs, async (spec) => {
+      const candidate = spawn(spec.command, spec.args(path), { stdio: ["ignore", "ignore", "pipe"] });
+      await waitForSpawn(candidate);
+      if (specs.length > 1) await waitForRecorderStartup(candidate);
+      return candidate;
+    });
     await waitForStop();
     child.kill("SIGINT");
     await waitForClose(child);
@@ -25935,6 +26173,92 @@ async function flushCliUsageAnalytics() {
   if (!current) return;
   await flushUsageAnalyticsWithin(() => current.flush(), CLI_USAGE_ANALYTICS_FLUSH_TIMEOUT_MS);
 }
+async function sendCliChatPrompt(context, sessionId, text2, settings) {
+  const content = buildLiveChatUserMessage(text2, settings);
+  const key = new Uint8Array(Buffer.from(context.syncCredential.secret, "base64"));
+  const localId = `saycode-cli-${process.pid}-${Math.random().toString(36).slice(2)}`;
+  await context.rest.sendMessage(sessionId, localId, encodeMessageContent(content, key));
+  return localId;
+}
+class ChatStatusController {
+  constructor(input, onInterrupt, output) {
+    this.input = input;
+    this.onInterrupt = onInterrupt;
+    this.output = output;
+  }
+  shownInputMode = null;
+  apply(chat, event) {
+    chat.apply(event);
+    this.sync(chat.current);
+  }
+  sync(state) {
+    const presentation = chatPresentation(state);
+    const previousInputMode = this.shownInputMode;
+    if (presentation.inputMode === "locked") this.input.lock(this.onInterrupt);
+    if (presentation.inputMode !== "locked") {
+      if (presentation.inputMode === "permission" && previousInputMode === "prompt") {
+        this.input.cancelQuestion();
+      }
+      this.input.unlock();
+    }
+    if (presentation.inputMode === previousInputMode) return;
+    this.shownInputMode = presentation.inputMode;
+    this.output(presentation);
+  }
+}
+async function choose(label, choices, selected, ask) {
+  if (choices.length === 0) return null;
+  const currentIndex = Math.max(0, choices.findIndex((entry) => entry.key === selected));
+  const index = choiceIndex(await ask(choiceQuestion(label, choices, currentIndex)), choices.length, currentIndex);
+  return choices[index]?.key ?? null;
+}
+async function promptLiveChatModel(current, ask) {
+  const model = await choose("Model", liveChatModelChoices(current), current.model, ask);
+  if (!model) return current;
+  let settings = updateLiveChatSettings(current, { model });
+  const effort = await choose("Effort", liveChatEffortChoices(settings), settings.effort, ask);
+  if (effort) settings = updateLiveChatSettings(settings, { effort });
+  return settings;
+}
+async function promptLiveChatEffort(current, ask) {
+  const effort = await choose("Effort", liveChatEffortChoices(current), current.effort, ask);
+  return effort ? updateLiveChatSettings(current, { effort }) : current;
+}
+function liveChatSettingsLabel(settings) {
+  const model = liveChatModelChoices(settings).find((choice) => choice.key === settings.model)?.label ?? settings.model;
+  const effort = liveChatEffortChoices(settings).find((choice) => choice.key === settings.effort)?.label;
+  return effort ? `${model} · ${effort}` : model;
+}
+function parseVoiceChatCommand(prompt) {
+  if (prompt !== "/voice" && !prompt.startsWith("/voice ")) return null;
+  return { voiceFile: prompt.slice("/voice".length).trim() || null };
+}
+async function handleLiveChatCommand(prompt, current, ask) {
+  if (prompt !== "/model" && prompt !== "/effort") return { handled: false, settings: current };
+  if (!current.agent) {
+    return {
+      handled: true,
+      settings: current,
+      message: "Model controls are not available for this session agent."
+    };
+  }
+  if (prompt === "/effort" && current.model === "default") {
+    return {
+      handled: true,
+      settings: current,
+      message: "Choose a model with /model before selecting effort."
+    };
+  }
+  if (prompt === "/effort" && liveChatEffortChoices(current).length === 0) {
+    return {
+      handled: true,
+      settings: current,
+      message: "Effort controls are not available for the current model."
+    };
+  }
+  const settings = prompt === "/model" ? await promptLiveChatModel(current, ask) : await promptLiveChatEffort(current, ask);
+  return { handled: true, settings, message: `Next message: ${liveChatSettingsLabel(settings)}` };
+}
 const DETACH_COMMAND = "/detach";
 async function spawnSession(transport, machineId, directory, agent) {
   const result = await transport.rpc(machineId, "spawn-happy-session", { directory, agent }, 6e4);
@@ -25963,47 +26287,6 @@ async function replyToPermission(transport, sessionId, request, answer) {
     ...answer === "approve-always" ? { mode: "bypassPermissions" } : {}
   });
 }
-async function sendPrompt(context, sessionId, text2, options) {
-  const content = options ? buildCliUserMessage(text2, options) : { role: "user", content: { type: "text", text: text2 }, meta: { permissionMode: "default" } };
-  const key = new Uint8Array(Buffer.from(context.syncCredential.secret, "base64"));
-  const localId = `saycode-cli-${process.pid}-${Math.random().toString(36).slice(2)}`;
-  await context.rest.sendMessage(sessionId, localId, encodeMessageContent(content, key));
-  return localId;
-}
-class ChatSession {
-  state = createChatState();
-  waiters = [];
-  detached = false;
-  get current() {
-    return this.state;
-  }
-  get isDetached() {
-    return this.detached;
-  }
-  /** Leave without touching the remote turn — it keeps running on the machine. */
-  detach() {
-    this.detached = true;
-    this.wakeAll();
-  }
-  wakeAll() {
-    const waiting = this.waiters;
-    this.waiters = [];
-    for (const wake of waiting) wake();
-  }
-  apply(event) {
-    const next = reduceChatState(this.state, event);
-    if (next === this.state) return;
-    this.state = next;
-    this.wakeAll();
-  }
-  /** Resolves when the turn ends, a permission needs an answer, or on detach. */
-  async waitForAttention() {
-    while (this.state.phase === "responding" && !this.detached) {
-      await new Promise((resolve) => this.waiters.push(resolve));
-    }
-    return this.state;
-  }
-}
 async function resolveSpawnTarget(context, options) {
   if (options.project) {
     const project = await resolveProject(context, options.project);
@@ -26079,8 +26362,13 @@ async function runChat(context, options, providedTransport) {
         }
       }
       context.out.raw(`Session ${sessionId}`);
-      context.out.raw("During a response, typing is locked. Ctrl+C opens response options.");
-      context.out.raw("At the prompt: /voice to dictate · /detach to leave with the agent still running · /exit to leave.\n");
+      for (const hint of chatStartupHints()) context.out.raw(hint);
+      let liveSettings = newConversationOptions ? createLiveChatSettings(newConversationOptions) : liveChatSettingsFromSessionRows(
+        await context.rest.listSessions().catch(() => []),
+        sessionId,
+        [decodeBase64(context.syncCredential.secret)],
+        options.agent
+      );
       const chat = new ChatSession();
       const renderer = createSessionEventRenderer(terminalContentWidth(process.stdout.columns));
       const answered = /* @__PURE__ */ new Set();
@@ -26092,7 +26380,10 @@ async function runChat(context, options, providedTransport) {
         transport,
         sessionId,
         resumeHistoryCount({ resuming, ...options.since !== void 0 ? { since: options.since } : {} }),
-        (content) => chat.apply({ type: "content", content }),
+        (content) => {
+          chat.apply({ type: "content", content });
+          liveSettings = observeLiveChatMessage(liveSettings, content);
+        },
         renderer
       );
       const rl = createInterface({ input: process.stdin, output: process.stdout });
@@ -26123,6 +26414,11 @@ Leaving. Reattach with \`saycode chat -s ${sessionId}\`.`);
           context.out.raw("…still working.");
         });
       };
+      const status = new ChatStatusController(input, onSigint, (presentation) => {
+        const style = presentation.inputMode === "prompt" ? "status" : presentation.inputMode === "permission" ? "tool" : "thinking";
+        context.out.line({ style, text: presentation.status });
+      });
+      status.sync(chat.current);
       const stopFollowing = followSession({
         context,
         transport,
@@ -26132,8 +26428,8 @@ Leaving. Reattach with \`saycode chat -s ${sessionId}\`.`);
         renderer,
         onContent: (content) => {
           printContent(context, content, renderer);
-          chat.apply({ type: "content", content });
-          if (chat.current.phase === "responding") input.lock(onSigint);
+          status.apply(chat, { type: "content", content });
+          liveSettings = observeLiveChatMessage(liveSettings, content);
         },
         onUpdate: (update) => {
           const cipher = readSessionAgentState(update, sessionId);
@@ -26146,8 +26442,7 @@ Leaving. Reattach with \`saycode chat -s ${sessionId}\`.`);
           }
           for (const request of pendingPermissionRequestsFromState(decoded)) {
             if (answered.has(request.requestId)) continue;
-            chat.apply({ type: "permission-requested", request });
-            input.cancelQuestion();
+            status.apply(chat, { type: "permission-requested", request });
           }
         }
       });
@@ -26156,25 +26451,18 @@ Leaving. Reattach with \`saycode chat -s ${sessionId}\`.`);
       try {
         for (; ; ) {
           if (chat.current.phase !== "idle") {
-            if (chat.current.phase === "responding") {
-              context.out.line({ style: "thinking", text: chatPresentation(chat.current).status });
-              input.lock(onSigint);
-            }
             for (; ; ) {
               const state = await chat.waitForAttention();
               if (chat.isDetached) break;
               if (state.phase !== "awaiting-permission" || !state.pendingPermission) break;
               const request = state.pendingPermission;
-              context.out.line({ style: "tool", text: chatPresentation(state).status });
               let answer = parsePermissionAnswer(await input.ask(`${permissionPromptText(request)} `) ?? "n");
               while (answer === "unknown") {
                 answer = parsePermissionAnswer(await input.ask("Please answer y, n, or a. ") ?? "n");
               }
               answered.add(request.requestId);
               await replyToPermission(transport, sessionId, request, answer);
-              chat.apply({ type: "permission-answered" });
-              context.out.line({ style: "thinking", text: chatPresentation(chat.current).status });
-              input.lock(onSigint);
+              status.apply(chat, { type: "permission-answered" });
             }
             if (chat.isDetached) {
               outcome = "detached";
@@ -26183,7 +26471,7 @@ Leaving. Reattach with \`saycode chat -s ${sessionId}\`.`);
             continue;
           }
           const ready = chatPresentation(chat.current);
-          context.out.line({ style: "status", text: ready.status });
+          status.sync(chat.current);
           let prompt = "";
           if (pendingVoice) {
             const voiceFile = typeof pendingVoice === "string" ? pendingVoice : null;
@@ -26210,10 +26498,28 @@ Leaving. Reattach with \`saycode chat -s ${sessionId}\`.`);
             outcome = "detached";
             break;
           }
-          if (prompt === "/voice" || prompt.startsWith("/voice ")) {
-            const voiceFile = prompt.slice("/voice".length).trim() || null;
+          if (prompt === "/model" && needsLiveChatModelRefresh(liveSettings)) {
+            liveSettings = refreshLiveChatModelsFromSessionRows(
+              liveSettings,
+              await context.rest.listSessions().catch(() => []),
+              sessionId,
+              [decodeBase64(context.syncCredential.secret)]
+            );
+          }
+          const liveCommand = await handleLiveChatCommand(
+            prompt,
+            liveSettings,
+            (question) => input.ask(question)
+          );
+          if (liveCommand.handled) {
+            liveSettings = liveCommand.settings;
+            if (liveCommand.message) context.out.raw(liveCommand.message);
+            continue;
+          }
+          const voiceCommand = parseVoiceChatCommand(prompt);
+          if (voiceCommand) {
             try {
-              prompt = await captureCliVoicePrompt(context, voiceFile, async () => {
+              prompt = await captureCliVoicePrompt(context, voiceCommand.voiceFile, async () => {
                 await input.ask("Press Enter to stop recording. ");
               });
               context.out.raw(`Transcript: ${prompt}`);
@@ -26235,9 +26541,8 @@ Leaving. Reattach with \`saycode chat -s ${sessionId}\`.`);
             }
           }
           if (prompt === "") continue;
-          chat.apply({ type: "message-sent" });
-          input.lock(onSigint);
-          ownLocalIds.add(await sendPrompt(context, sessionId, prompt, newConversationOptions));
+          status.apply(chat, { type: "message-sent" });
+          ownLocalIds.add(await sendCliChatPrompt(context, sessionId, prompt, liveSettings));
           await recordCliUsage("message_sent");
         }
       } finally {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@buzzni/saycode-cli",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Drive Saycode sessions across your machines from the terminal.",
   "type": "module",
   "bin": {