daily-focus 2.0.0-dev.19 → 2.0.0-dev.21

package/SETUP.md

@@ -32,8 +32,8 @@ on your login shell's PATH, then where their installers put them, and checks tha
 the one it finds is logged in. With one ready it doesn't ask: it uses Codex if
 that is ready, otherwise Claude Code, and says so in a line you can **Change**.
 With neither ready, it says what is wrong with each and the command that fixes it
-(`codex login`, `claude auth login`), links to the installers, and takes the path
-to one it couldn't find.
+(`codex login`, `claude auth login`), links to the installers with the plan each
+needs, and takes the path to one it couldn't find.
 
 Then it asks a few questions, one at a time, and each comes with the answer you
 most likely want already ticked: confirm it or change it. A list can be left
@@ -67,11 +67,14 @@ card holds.
 
 The sessions run on the newest flagship model at low effort (Opus for Claude Code,
 the first model in Codex's own list for Codex), which measured as fast as the
-lighter models and, unlike them, told your calendars from other people's. They
-only read, in an empty directory. Claude Code is given read tools by name, and
-under Codex every connector write is refused, drafts included; `gh` and `acli` are
-held to reading by their instructions, as
-[the assistant's](#what-the-assistant-can-do) are.
+lighter models and, unlike them, told your calendars from other people's. When
+your ChatGPT plan or workspace can't use Codex's first model, as an Enterprise or
+Edu workspace can't until an admin turns GPT-6.1 Sol on, they run on GPT-6 Sol,
+which answered the same; never on anything lighter. When Claude or Codex is busy,
+the card says so and offers to try again. They only read, in an empty directory.
+Claude Code is given read tools by name, and under Codex every connector write is
+refused, drafts included; `gh` and `acli` are held to reading by their
+instructions, as [the assistant's](#what-the-assistant-can-do) are.
 
 Nothing is saved until the last step, **Write my first brief**. It saves the
 settings, writes your source list from the answers (unless you already have one,
@@ -134,7 +137,9 @@ The dashboard runs the agent through a coding-agent CLI you already have. Instal
 and log in to the [Codex CLI](https://developers.openai.com/codex/cli) or
 [Claude Code](https://code.claude.com/docs), and choose it on the setup screen or
 as **Write the brief with** under **Morning agent** in the settings
-(`DAILY_FOCUS_AGENT`).
+(`DAILY_FOCUS_AGENT`). Each needs a paid plan: ChatGPT Plus or higher for Codex,
+whose Free and Go plans have it only in the desktop app, and any paid Claude plan
+for Claude Code.
 
 Each scheduled morning at 07:00 your time the dashboard starts the agent through
 that CLI, headless, in the store, and the brief appears when it finishes. Set
@@ -431,13 +436,14 @@ Download `Daily-Focus.dmg` from the [latest release](https://github.com/watson/d
 open it and drag the app to Applications, then open it from there.
 It has no window and no Dock icon: look for it in the menu bar.
 
-The app keeps itself up to date without a new disk image. **Updates** in the menu
-shows two versions, the app's and the dashboard's, and which releases to take:
-**Stable Releases**, or **Development Builds**, a build of every change as soon as
-it is merged. A few times a day the app asks npm for the newest release, and when
-it finds one, it posts a notification and the menu offers **Update Daily Focus**.
-Updating fetches only what the release changed. Most releases change only the
-dashboard, a few hundred kilobytes, and the dashboard restarts into it; if it
+The app keeps itself up to date without a new disk image. **About Daily Focus** in
+the menu shows two versions, the app's and the dashboard's, and **Updates** which
+releases to take: **Stable Releases**, or **Development Builds**, a build of every
+change as soon as it is merged. A few times a day the app asks npm for the newest
+release, and when it finds one, it posts a notification and the menu offers
+**Update Daily Focus**. Updating fetches only what the release changed. Most
+releases change only the dashboard, a few hundred kilobytes, and the dashboard
+restarts into it; if it
 doesn't start, the app goes back to the one it had and says so. When a release
 changes the app itself, the app downloads the new app, about 40 MB, puts it in its
 own place and opens it again, and the new app carries the new dashboard. Either

package/dist/{chunk-JTMBBUMD.js → chunk-YA2JMWCY.js}

@@ -264,6 +264,33 @@ function readSteps(value) {
   }
   return steps;
 }
+function explainFailure(cli, error) {
+  if (cli === "claude") {
+    if (/\b529\b|overloaded|experiencing high load/i.test(error)) return { cause: "busy", message: "Claude is busy right now" };
+    const model2 = /issue with the selected model \((.+?)\)/.exec(error)?.[1];
+    if (model2) return { cause: "model", message: `your Claude account can't use the model \u201C${model2}\u201D` };
+    return null;
+  }
+  const model = /The '(.+?)' model is not supported when using Codex/.exec(error)?.[1];
+  if (model) return { cause: "model", message: `your ChatGPT plan or workspace doesn't include the model \u201C${model}\u201D` };
+  if (/To use Codex with your ChatGPT plan/.test(error)) {
+    return { cause: "plan", message: "your ChatGPT plan doesn't include the Codex CLI, which needs Plus or higher" };
+  }
+  if (/at capacity|high demand|server_overloaded/i.test(error)) return { cause: "busy", message: "Codex is busy right now" };
+  return null;
+}
+function failed(cli, error) {
+  const explained = explainFailure(cli, error);
+  return explained ? { ok: false, error: explained.message, cause: explained.cause } : { ok: false, error };
+}
+function unwrapCodexError(message) {
+  try {
+    const inner = JSON.parse(message)?.error?.message;
+    return typeof inner === "string" && inner.trim() ? inner : message;
+  } catch {
+    return message;
+  }
+}
 function parseLine(line) {
   const trimmed = line.trim();
   if (!trimmed.startsWith("{")) return null;
@@ -321,7 +348,7 @@ var claudeAdapter = {
     if (type === "result") {
       const ok = event.is_error !== true && event.subtype === "success";
       const reply = typeof event.result === "string" ? event.result : void 0;
-      const parsed = { done: ok ? { ok, reply } : { ok, error: reply ?? String(event.subtype ?? "failed") } };
+      const parsed = { done: ok ? { ok, reply } : failed("claude", reply ?? String(event.subtype ?? "failed")) };
       if (typeof event.session_id === "string") parsed.sessionId = event.session_id;
       return parsed;
     }
@@ -365,7 +392,7 @@ var codexAdapter = {
     if (type === "turn.failed" || type === "error") {
       const error = event.error;
       const message = typeof event.message === "string" ? event.message : error?.message;
-      return { done: { ok: false, error: message ?? String(type) } };
+      return { done: failed("codex", message ? unwrapCodexError(message) : String(type)) };
     }
     return null;
   }
@@ -409,8 +436,8 @@ function claudeStep(block) {
 }
 function codexStep(item, completed) {
   if (typeof item.id !== "string") return null;
-  const failed = item.status === "failed" || item.error !== void 0 && item.error !== null;
-  const state = completed ? failed ? "failed" : "done" : "running";
+  const failed2 = item.status === "failed" || item.error !== void 0 && item.error !== null;
+  const state = completed ? failed2 ? "failed" : "done" : "running";
   if (item.type === "command_execution") {
     const exited = typeof item.exit_code === "number" && item.exit_code !== 0;
     return {

package/dist/cli.js

@@ -51,7 +51,7 @@ function shouldOpen(flag) {
   return flag && process.stdout.isTTY === true && !process.env.CI;
 }
 async function demo(open, profile) {
-  const { DEMO_FIXED, demoEnv, demoIntegrations, demoProfile, writeDemoStore } = await import("./demo-KE6WDWMA.js");
+  const { DEMO_FIXED, demoEnv, demoIntegrations, demoProfile, writeDemoStore } = await import("./demo-2F7M22LA.js");
   const chosen = demoProfile(profile);
   const store = await mkdtemp(join(tmpdir(), "daily-focus-demo-"));
   process.on("exit", () => rmSync(store, { recursive: true, force: true }));
@@ -68,7 +68,7 @@ async function demo(open, profile) {
   );
 }
 async function start(open, onStarted, options = {}) {
-  const { runServer } = await import("./server-V44HFRLA.js");
+  const { runServer } = await import("./server-VND7GAPL.js");
   await runServer({
     ...options,
     onStarted: (url) => {

package/dist/{demo-KE6WDWMA.js → demo-2F7M22LA.js}

@@ -3,7 +3,7 @@ import {
   actionOf,
   autoKeys,
   judge
-} from "./chunk-JTMBBUMD.js";
+} from "./chunk-YA2JMWCY.js";
 import {
   dateFromNow,
   sampleBrief,

package/dist/{server-V44HFRLA.js → server-VND7GAPL.js}

@@ -15,7 +15,7 @@ import {
   resolveBoard,
   shorten,
   unwrapShell
-} from "./chunk-JTMBBUMD.js";
+} from "./chunk-YA2JMWCY.js";
 import {
   FOCUS_TEMPLATE,
   SETTINGS,
@@ -3560,8 +3560,8 @@ import { createInterface as createInterface2 } from "node:readline";
 
 // src/questions.ts
 var INSTALL = {
-  codex: { label: "Install Codex", url: "https://developers.openai.com/codex/cli" },
-  claude: { label: "Install Claude Code", url: "https://code.claude.com/docs" }
+  codex: { label: "Install Codex", url: "https://developers.openai.com/codex/cli", needs: "Codex needs ChatGPT Plus or higher" },
+  claude: { label: "Install Claude Code", url: "https://code.claude.com/docs", needs: "Claude Code needs a paid Claude plan" }
 };
 function option(value, label, detail = null, group = null) {
   return { value, label, detail, group };
@@ -3606,14 +3606,17 @@ var cli = {
     const report = ctx.clis;
     const ready = CLI_PREFERENCE.filter((name) => report[name].ready);
     if (ready.length === 0) {
-      const lines = CLI_PREFERENCE.map((name) => `${report[name].problem ?? `${CLI_LABEL[name]} can't be used`}.`);
+      const labels = CLI_PREFERENCE.map((name) => CLI_LABEL[name]);
+      const wrong = CLI_PREFERENCE.every((name) => !report[name].path) ? `Neither ${labels.join(" nor ")} is installed.` : CLI_PREFERENCE.every((name) => report[name].fix === LOGIN[name].fix) ? `${labels.join(" and ")} are installed, but neither is logged in.` : CLI_PREFERENCE.map((name) => `${report[name].problem ?? `${CLI_LABEL[name]} can't be used`}.`).join(" ");
       const fix = CLI_PREFERENCE.map((name) => report[name].fix).find((command3) => command3) ?? null;
+      const missing = CLI_PREFERENCE.filter((name) => !report[name].path);
+      const needs = missing.length ? `${missing.map((name) => INSTALL[name].needs).join("; ")}. ` : "";
       return card({
         problem: {
-          message: `${lines.join(" ")} ${fix ? "Run this in a terminal, then check again." : "Install one, log in once in a terminal, then check again."}`,
+          message: `${wrong} ${needs}${fix ? "Run this in a terminal, then check again." : "Install one, log in once in a terminal, then check again."}`,
           command: fix,
           blocking: true,
-          links: CLI_PREFERENCE.filter((name) => !report[name].path).map((name) => INSTALL[name])
+          links: missing.map((name) => ({ label: INSTALL[name].label, url: INSTALL[name].url }))
         },
         fields: [
           field("path", "Installed somewhere setup didn\u2019t look? Its path", "", {
@@ -4088,6 +4091,7 @@ var SESSION_MODEL = {
   claude: { model: "opus", effort: "low" },
   codex: { model: null, effort: "low" }
 };
+var CODEX_FALLBACK_MODEL = "gpt-6-sol";
 var ONBOARDING_TOOLS = [
   "Bash(gh *)",
   "Bash(acli *)",
@@ -4184,6 +4188,7 @@ var Onboarding = class {
   spawnFn;
   gates = /* @__PURE__ */ new Map();
   codexOff = null;
+  /** The model Codex's sessions run on: the catalog's first until one fails for the account, then `CODEX_FALLBACK_MODEL`. */
   codexModel = null;
   /** What looking for the CLIs found, once the screen has asked. Not kept: what is installed changes. */
   detected = null;
@@ -4606,6 +4611,11 @@ ${request}`, resume, said);
         ok: false,
         error: `${cli2} exited with code ${code}${stderr.length ? `: ${stderr.join("").trim().split("\n").slice(-3).join(" ")}` : ""}`
       };
+      if (cli2 === "codex" && outcome.cause === "model" && model !== CODEX_FALLBACK_MODEL && this.file?.proposals[question.id] === record) {
+        this.codexModel = Promise.resolve(CODEX_FALLBACK_MODEL);
+        void this.ask(question, ctx, prompt, resume, conversation).catch((err) => console.error(`[daily-focus] setup could not ask again: ${err.message}`)).finally(ended);
+        return;
+      }
       void this.settle(question.id, record, outcome.ok ? { ok: true, reply: outcome.reply ?? said } : outcome).catch((err) => console.error(`[daily-focus] setup could not keep what it found: ${err.message}`)).finally(ended);
     });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "daily-focus",
-  "version": "2.0.0-dev.19",
+  "version": "2.0.0-dev.21",
   "description": "An interactive dashboard of what you should focus on today at work",
   "keywords": [
     "dashboard",
@@ -41,7 +41,7 @@
   },
   "daily-focus": {
     "appInterface": 1,
-    "appSource": "6a3ab505f4ac808ebaabb673be81176e3f699c22"
+    "appSource": "0df3059a46d460871b08ddea9dd9a793f20cf9f5"
   },
   "scripts": {
     "start": "node src/server.ts",