clixad 0.0.1-beta.1 → 0.0.1-beta.2

package/dist/clixad.mjs

@@ -210,14 +210,18 @@ var init_client = __esm({
         if (!res.ok) throw new Error(`checkout failed: ${res.status} ${await res.text()}`);
         return res.json();
       }
-      async models() {
-        const res = await fetch(`${this.config.gatewayUrl}/v1/models`);
+      // Both take an optional signal for the REPL's sake: they are awaited while the
+      // input box is locked, and a gateway that is cold-starting (Render's free tier,
+      // the better part of a minute) would otherwise be indistinguishable from a
+      // hung terminal. Nothing else passes one — a one-shot CLI command has Ctrl+C.
+      async models(signal) {
+        const res = await fetch(`${this.config.gatewayUrl}/v1/models`, { signal });
         if (!res.ok) throw new Error(`models failed: ${res.status}`);
         const data = await res.json();
         return data.data;
       }
-      async wallet() {
-        const res = await fetch(`${this.config.gatewayUrl}/v1/wallet`, { headers: this.headers() });
+      async wallet(signal) {
+        const res = await fetch(`${this.config.gatewayUrl}/v1/wallet`, { headers: this.headers(), signal });
         if (res.status === 401) throw await authFailure(res, "wallet");
         if (!res.ok) throw new Error(`wallet failed: ${res.status}`);
         return res.json();
@@ -1483,7 +1487,9 @@ import { spawn as spawn3 } from "node:child_process";
 function openBrowser(url) {
   const cmd = process.platform === "win32" ? "cmd" : process.platform === "darwin" ? "open" : "xdg-open";
   const args = process.platform === "win32" ? ["/c", "start", "", url] : [url];
-  spawn3(cmd, args, { detached: true, stdio: "ignore", windowsHide: true }).unref();
+  const child = spawn3(cmd, args, { detached: true, stdio: "ignore", windowsHide: true });
+  child.on("error", () => void 0);
+  child.unref();
 }
 var init_browser = __esm({
   "src/browser.ts"() {
@@ -2118,11 +2124,13 @@ function App({ client, config, wallet, session, initialTask }) {
   const [tick, setTick] = useState(0);
   const [startedAt, setStartedAt] = useState(0);
   const [quitHint, setQuitHint] = useState(false);
+  const [busyLabel, setBusyLabel] = useState(WORKING);
   const [sponsor, setSponsor] = useState(null);
   const messagesRef = useRef(messages);
   messagesRef.current = messages;
   const permRef = useRef(createState("normal"));
   const abortRef = useRef(null);
+  const busyAbortRef = useRef(null);
   const filesRef = useRef(null);
   const ctrlCRef = useRef(0);
   const sessionRef = useRef(session ?? { id: newSessionId(), started: (/* @__PURE__ */ new Date()).toISOString() });
@@ -2324,6 +2332,30 @@ function App({ client, config, wallet, session, initialTask }) {
     },
     [client, contextWindow, handleEvent, model, nextSponsor, permit, push, root, session?.title]
   );
+  const stopCurrent = useCallback(() => {
+    abortRef.current?.abort();
+    busyAbortRef.current?.abort();
+  }, []);
+  const runBusy = useCallback(
+    async (label, fn) => {
+      const ac = new AbortController();
+      busyAbortRef.current = ac;
+      setBusy(true);
+      setBusyLabel(label);
+      setStartedAt(Date.now());
+      try {
+        await fn(ac.signal);
+      } catch (err) {
+        if (ac.signal.aborted) push({ kind: "notice", tone: "warn", text: "  (stopped)" });
+        else push({ kind: "notice", tone: "error", text: `  ${err.message}` });
+      } finally {
+        busyAbortRef.current = null;
+        setBusyLabel(WORKING);
+        setBusy(false);
+      }
+    },
+    [push]
+  );
   const runAdWall = useCallback(async () => {
     const task = pendingTaskRef.current;
     pendingTaskRef.current = null;
@@ -2337,18 +2369,28 @@ function App({ client, config, wallet, session, initialTask }) {
 ` : `  opened ${base} \u2014 paste your token there; waiting for the reward\u2026
 `) + `  Credits land on completion; being screened out of an offer pays nothing and is normal.`
     });
-    setBusy(true);
-    const deadline = Date.now() + 5 * 6e4;
     let credited = false;
-    while (Date.now() < deadline && !credited) {
-      await new Promise((r) => setTimeout(r, 3e3));
-      const w = await client.wallet().catch(() => void 0);
-      if (w && w.balance > before) {
-        setBalance(w.balance);
-        credited = true;
+    let stopped = false;
+    await runBusy(WAITING_FOR_REWARD, async (signal) => {
+      const deadline = Date.now() + 5 * 6e4;
+      while (Date.now() < deadline && !credited && !signal.aborted) {
+        await sleep(3e3, signal);
+        if (signal.aborted) break;
+        const w = await client.wallet(signal).catch(() => void 0);
+        if (w && w.balance > before) {
+          setBalance(w.balance);
+          credited = true;
+        }
       }
-    }
-    setBusy(false);
+      stopped = signal.aborted;
+    });
+    if (!credited) pendingTaskRef.current = task;
+    if (stopped)
+      return push({
+        kind: "notice",
+        tone: "warn",
+        text: "  stopped waiting. A reward still lands whenever the offer clears \u2014\n  /wallet checks the balance, /earn opens the wall again." + (task ? "\n  Your last request is still queued: press enter to retry it." : "")
+      });
     if (!credited)
       return push({
         kind: "notice",
@@ -2357,7 +2399,7 @@ function App({ client, config, wallet, session, initialTask }) {
       });
     push({ kind: "notice", tone: "good", text: "  credits added \u2014 continuing" });
     if (task) await runTurn2(task);
-  }, [balance, client, config.dashboardUrl, push, runTurn2]);
+  }, [balance, client, config.dashboardUrl, push, runBusy, runTurn2]);
   const runCommand = useCallback(
     async (line2) => {
       const [cmd, ...rest] = line2.slice(1).split(" ");
@@ -2390,83 +2432,74 @@ function App({ client, config, wallet, session, initialTask }) {
           push({ kind: "notice", text: `  mode \u2192 ${MODE_LABEL[permRef.current.mode]}` });
           return;
         }
-        case "compact": {
-          setBusy(true);
-          try {
-            const res = await compact(client, model, [
-              { role: "system", content: contextRef.current.systemPrompt },
-              ...messagesRef.current
-            ]);
-            if (!res) push({ kind: "notice", text: "  nothing to compact yet" });
-            else {
-              setMessages(res.messages.slice(1));
-              setBalance(res.balance);
-              setSpent((s) => s + res.creditsCharged);
-              push({
-                kind: "notice",
-                text: `  compacted: ~${Math.round(res.before / 1e3)}k \u2192 ~${Math.round(res.after / 1e3)}k tokens (${res.creditsCharged} credits)`
-              });
-            }
-          } catch (err) {
-            push({ kind: "notice", tone: "error", text: `  ${err.message}` });
-          }
-          setBusy(false);
+        // A model call like any other, so esc has to stop it like any other —
+        // and stopping it costs nothing, since the summary only replaces the
+        // conversation once the call has come back whole.
+        case "compact":
+          await runBusy(COMPACTING, async (signal) => {
+            const res = await compact(
+              client,
+              model,
+              [{ role: "system", content: contextRef.current.systemPrompt }, ...messagesRef.current],
+              { signal }
+            );
+            if (!res) return push({ kind: "notice", text: "  nothing to compact yet" });
+            setMessages(res.messages.slice(1));
+            setBalance(res.balance);
+            setSpent((s) => s + res.creditsCharged);
+            push({
+              kind: "notice",
+              text: `  compacted: ~${Math.round(res.before / 1e3)}k \u2192 ~${Math.round(res.after / 1e3)}k tokens (${res.creditsCharged} credits)`
+            });
+          });
           return;
-        }
         case "init":
           await runTurn2(INIT_PROMPT);
           return;
         // Always the picker — an id you have to remember and type is exactly
         // what a picker is for. A typed id only preselects a row.
-        case "model": {
-          setBusy(true);
-          const models = catalogRef.current.length ? catalogRef.current : await client.models().catch(() => []);
-          catalogRef.current = models;
-          setBusy(false);
-          if (!models.length) return push({ kind: "notice", tone: "error", text: "  could not load the model list" });
-          if (arg && !models.some((m) => m.id === arg)) {
-            push({ kind: "notice", tone: "warn", text: `  unknown model: ${arg}` });
-          }
-          const items = models.map((m) => ({
-            value: m.id,
-            label: m.id,
-            hint: `${m.tier.padEnd(8)}${adsPerTaskLabel(m.est_ads_per_task)}`,
-            current: m.id === model
-          }));
-          const preselect = items.findIndex((i) => i.value === arg);
-          setPickerSel(preselect >= 0 ? preselect : Math.max(0, items.findIndex((i) => i.current)));
-          setPicker({
-            title: "Select model",
-            subtitle: "Applies to this session and is saved as your default.",
-            items,
-            onPick: (choice) => {
-              config.model = choice.value;
-              saveConfig(config);
-              setModel2(choice.value);
-              push({ kind: "notice", text: `  model \u2192 ${choice.value}` });
+        case "model":
+          await runBusy(LOADING, async (signal) => {
+            const models = catalogRef.current.length ? catalogRef.current : await client.models(signal);
+            catalogRef.current = models;
+            if (!models.length) return push({ kind: "notice", tone: "error", text: "  could not load the model list" });
+            if (arg && !models.some((m) => m.id === arg)) {
+              push({ kind: "notice", tone: "warn", text: `  unknown model: ${arg}` });
             }
+            const items = models.map((m) => ({
+              value: m.id,
+              label: m.id,
+              hint: `${m.tier.padEnd(8)}${adsPerTaskLabel(m.est_ads_per_task)}`,
+              current: m.id === model
+            }));
+            const preselect = items.findIndex((i) => i.value === arg);
+            setPickerSel(preselect >= 0 ? preselect : Math.max(0, items.findIndex((i) => i.current)));
+            setPicker({
+              title: "Select model",
+              subtitle: "Applies to this session and is saved as your default.",
+              items,
+              onPick: (choice) => {
+                config.model = choice.value;
+                saveConfig(config);
+                setModel2(choice.value);
+                push({ kind: "notice", text: `  model \u2192 ${choice.value}` });
+              }
+            });
           });
           return;
-        }
-        case "models": {
-          setBusy(true);
-          try {
-            const ms = await client.models();
+        case "models":
+          await runBusy(LOADING, async (signal) => {
+            const ms = await client.models(signal);
             catalogRef.current = ms;
             push({
               kind: "notice",
               text: ms.map((m) => `  ${m.id.padEnd(24)} ${adsPerTaskLabel(m.est_ads_per_task)}`).join("\n")
             });
-          } catch (err) {
-            push({ kind: "notice", tone: "error", text: `  ${err.message}` });
-          }
-          setBusy(false);
+          });
           return;
-        }
-        case "wallet": {
-          setBusy(true);
-          try {
-            const w = await client.wallet();
+        case "wallet":
+          await runBusy(LOADING, async (signal) => {
+            const w = await client.wallet(signal);
             setBalance(w.balance);
             const reversals = w.ledger.filter((e) => e.reason === "ad_reversal");
             const reversed = reversals.reduce((sum, e) => sum + Math.abs(e.delta), 0);
@@ -2475,12 +2508,8 @@ function App({ client, config, wallet, session, initialTask }) {
               text: `  balance ${w.balance.toLocaleString("en-US")} credits \xB7 ${w.ads_today} offers today \xB7 $${w.earned_usd_today.toFixed(2)}/$${w.max_reward_usd_per_day.toFixed(2)} earned` + (reversals.length ? `
   recently: ${reversed.toLocaleString("en-US")} credits from ${reversals.length} offer${reversals.length === 1 ? "" : "s"} were reversed by the provider. Run \`clixad wallet\` for the full ledger.` : "")
             });
-          } catch (err) {
-            push({ kind: "notice", tone: "error", text: `  ${err.message}` });
-          }
-          setBusy(false);
+          });
           return;
-        }
         // The same browser handoff the paywall takes, rather than a second way of
         // doing it: /earn used to call the dev-only /v1/ads/reward simulator, so
         // in production the slash command the paywall itself recommends was a 404.
@@ -2491,7 +2520,7 @@ function App({ client, config, wallet, session, initialTask }) {
           push({ kind: "notice", tone: "warn", text: `  unknown command: /${cmd} \u2014 try /help` });
       }
     },
-    [client, config, cycleMode, exit, model, push, runTurn2]
+    [client, config, cycleMode, exit, model, push, runAdWall, runBusy, runTurn2]
   );
   const submit = useCallback(
     async (raw) => {
@@ -2540,7 +2569,7 @@ function App({ client, config, wallet, session, initialTask }) {
   );
   useInput((ch, key) => {
     if (key.ctrl && ch === "c") {
-      if (busy) return abortRef.current?.abort();
+      if (busy) return stopCurrent();
       if (!isEmpty(editor)) return setEditor(EMPTY);
       if (Date.now() - ctrlCRef.current < 2e3) return exit();
       ctrlCRef.current = Date.now();
@@ -2579,7 +2608,7 @@ function App({ client, config, wallet, session, initialTask }) {
       return;
     }
     if (busy) {
-      if (key.escape) abortRef.current?.abort();
+      if (key.escape) stopCurrent();
       return;
     }
     if (key.tab && key.shift) return cycleMode();
@@ -2675,7 +2704,9 @@ function App({ client, config, wallet, session, initialTask }) {
         /* @__PURE__ */ jsx2(Text2, { color: MANGO_BRIGHT, children: "\u276F " }),
         busy ? /* @__PURE__ */ jsxs2(Text2, { dimColor: true, children: [
           spinner,
-          " working\u2026 ",
+          " ",
+          busyLabel,
+          " ",
           elapsed,
           "s \xB7 esc to stop"
         ] }) : /* @__PURE__ */ jsx2(Text2, { children: renderInput(editor) })
@@ -2702,6 +2733,18 @@ function App({ client, config, wallet, session, initialTask }) {
     ] })
   ] });
 }
+function sleep(ms, signal) {
+  return new Promise((resolve2) => {
+    if (signal.aborted) return resolve2();
+    const done = () => {
+      clearTimeout(timer);
+      signal.removeEventListener("abort", done);
+      resolve2();
+    };
+    const timer = setTimeout(done, ms);
+    signal.addEventListener("abort", done, { once: true });
+  });
+}
 function renderInput(state) {
   return state.lines.map((line2, row) => {
     const prefix = row === 0 ? "" : "\n";
@@ -2762,7 +2805,7 @@ function tailLines(text, max) {
   const lines = text.split("\n");
   return lines.length <= max ? text : lines.slice(-max).join("\n");
 }
-var SPINNER, LIVE_OUTPUT_LINES, COMMITTED_OUTPUT_LINES;
+var SPINNER, WORKING, WAITING_FOR_REWARD, LOADING, COMPACTING, LIVE_OUTPUT_LINES, COMMITTED_OUTPUT_LINES;
 var init_app = __esm({
   "src/tui/app.tsx"() {
     "use strict";
@@ -2785,6 +2828,10 @@ var init_app = __esm({
     init_suggest();
     init_views();
     SPINNER = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
+    WORKING = "working\u2026";
+    WAITING_FOR_REWARD = "waiting for the offer\u2026";
+    LOADING = "loading\u2026";
+    COMPACTING = "compacting\u2026";
     LIVE_OUTPUT_LINES = 5;
     COMMITTED_OUTPUT_LINES = 4;
   }
@@ -2819,6 +2866,31 @@ init_session();
 init_kimi();
 init_banner();
 init_browser();
+
+// src/title.ts
+var APP_TITLE = "Clixad";
+function titleEnabled({ isTTY, env }) {
+  const flag = env.CLIXAD_TITLE?.trim().toLowerCase();
+  if (flag === "0" || flag === "false" || flag === "off" || flag === "no") return false;
+  if (!isTTY) return false;
+  if (env.TERM === "dumb") return false;
+  if (env.CI !== void 0 && env.CI !== "") return false;
+  return true;
+}
+function titleSequence(title) {
+  return `\x1B]0;${title.replace(/[\x00-\x1f\x7f]/g, " ").trim()}\x07`;
+}
+function setTerminalTitle(title = APP_TITLE, out = process.stdout) {
+  process.title = title.toLowerCase();
+  if (!titleEnabled({ isTTY: out.isTTY, env: process.env })) return;
+  out.write(titleSequence(title));
+}
+function clearTerminalTitle(out = process.stdout) {
+  if (!titleEnabled({ isTTY: out.isTTY, env: process.env })) return;
+  out.write(titleSequence(""));
+}
+
+// src/main.ts
 var c = {
   cyan: (s) => `\x1B[36m${s}\x1B[0m`,
   green: (s) => `\x1B[32m${s}\x1B[0m`,
@@ -2828,6 +2900,8 @@ var c = {
   bold: (s) => `\x1B[1m${s}\x1B[0m`
 };
 async function main() {
+  setTerminalTitle();
+  process.on("exit", () => clearTerminalTitle());
   const [cmd, ...rest] = process.argv.slice(2);
   const config = loadConfig();
   const client = new GatewayClient(config);
@@ -2925,7 +2999,7 @@ async function githubLogin(client, config, start, invite) {
   const deadline = Date.now() + start.expires_in * 1e3;
   let interval = Math.max(start.interval, 1);
   while (Date.now() < deadline) {
-    await sleep(interval * 1e3);
+    await sleep2(interval * 1e3);
     process.stdout.write(c.dim("."));
     const poll = await client.devicePoll(start.session, invite);
     if (poll.status === "pending") {
@@ -2976,7 +3050,7 @@ async function devLogin(client, config, email, invite) {
   console.log(`  balance: ${c.bold(String(res.balance))} credits (signup bonus)`);
   console.log(c.dim(`  token stored in ${configPath()}`));
 }
-var sleep = (ms) => new Promise((r) => setTimeout(r, ms));
+var sleep2 = (ms) => new Promise((r) => setTimeout(r, ms));
 function logout(config) {
   delete config.token;
   delete config.userId;
@@ -3052,7 +3126,7 @@ async function earn(client, config) {
   process.stdout.write(c.dim("  waiting for an offer to clear"));
   const deadline = Date.now() + 5 * 60 * 1e3;
   while (Date.now() < deadline) {
-    await sleep(3e3);
+    await sleep2(3e3);
     process.stdout.write(c.dim("."));
     const balance = (await safeWallet(client))?.balance ?? before;
     if (balance > before) {
@@ -3097,7 +3171,7 @@ async function buyCmd(client, config, pack) {
   process.stdout.write(c.dim("  waiting for payment to clear"));
   const deadline = Date.now() + 5 * 60 * 1e3;
   while (Date.now() < deadline) {
-    await sleep(3e3);
+    await sleep2(3e3);
     process.stdout.write(c.dim("."));
     const balance = (await safeWallet(client))?.balance ?? before;
     if (balance > before) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clixad",
-  "version": "0.0.1-beta.1",
+  "version": "0.0.1-beta.2",
   "description": "Free AI coding agent in your terminal, funded by rewarded ads.",
   "license": "UNLICENSED",
   "type": "module",