@wirecat/cli-core 0.506.0 → 0.507.0

package/CHANGELOG.md

@@ -7,6 +7,29 @@ shape of this file.
 
 ## Unreleased
 
+## 0.507.0 — 31.10.2026
+
+### Added
+
+- **`messages sync --json` prints its progress on stderr**, for a window to draw a bar instead of an endless one
+  (WireCat Desktop). One JSON line each, counts only — never a chat's id or title:
+  `{"event":"progress","step":"sync","chats":3,"chats_done":1,"fetched":250}`. With `--all`, one once the chat list
+  is read (`chats_done` 0), then one after each chat, those passed as already current included; for one chat, one per
+  page with `chats` and `chats_done` `null`. At most about two a second; the first and last of `--all` always come.
+  Only in machine output (`--json`, `--jsonl`, or stdout not a terminal) and not in a `--background` job's log;
+  stdout still carries the one answer. Archive services take an optional `onChat` for the same counts.
+
+### Changed — may break callers
+
+- **Needs `@wirecat/cli-base` 0.68.0** (peer range `>=0.68.0 <0.69.0`). cli-base's `Credentials` in `auto` now reads
+  a sign-in the private file holds before the keyring and keeps its refreshes there (WC-SECR-4).
+
+### Fixed
+
+- **A new OAuth sign-in moves a file sign-in back to the keyring.** `TokenStorage.write` takes `{ signIn: true }`, and
+  the keeper's `signIn` and `save` pass it: the keyring is tried again and, once it takes the sign-in, the file copy
+  is removed. A refresh stays where the sign-in is, so a locked keyring is not tried for it on every refresh.
+
 ## 0.506.0 — 31.10.2026
 
 ### Added

package/dist/cli/messenger/backfill-command.js

@@ -12,6 +12,7 @@ import { JOBS_QUERY, jobItems } from "../../services/job-query.js";
 import { dateWindow } from "../../services/moment.js";
 import { validateCatchUpBounds } from "../../services/search-catchup.js";
 import { applyTaskRulesSinceLastPass } from "../../services/task-rules.js";
+import { stepLines } from "../../terminal/step-lines.js";
 import { environmentOf } from "../context.js";
 import { destroysNothing, FETCH, LOCAL_READ, LOCAL_WRITE } from "../effects.js";
 import { itemOf, listOf, renderAnswer, snakeKeys } from "../envelope.js";
@@ -41,7 +42,8 @@ export const syncCommand = (messenger) => {
         cooperative: true,
     })
         .summary("fetch and save a chat's message history")
-        .description("bring a chat's history in the local store up to date, newest first; run it again to continue; --all syncs every chat")
+        .description("bring a chat's history in the local store up to date, newest first; run it again to continue; --all syncs every chat; " +
+        'with --json, stderr carries progress lines: {"event":"progress","step":"sync","chats","chats_done","fetched"}, counts only')
         .argument("[chat]", messenger.chatArgument)
         .option("--all", `every chat, most recently active first — what search needs; the last ${ALL_SINCE} unless --since-time or --last`)
         .option("--limit <n>", `at most this many messages in this run, per chat with --all; ${fetching.maxPages * fetching.page} if not given`, wholeNumber)
@@ -139,6 +141,8 @@ export const syncCommand = (messenger) => {
         const jobs = jobsDir(messenger.app, context.env);
         const jobId = context.env[envName(messenger.app, "BACKFILL_JOB")];
         const stop = stopOnSignal(this);
+        // A background job keeps its log as it was; its progress is the job file.
+        const progress = syncProgress(stepLines(context.streams.diagnostic, !jobId && context.format !== "pretty"));
         try {
             const options = {
                 limit,
@@ -149,10 +153,13 @@ export const syncCommand = (messenger) => {
                 ...(last === undefined ? {} : { last }),
                 note: context.renderer.note,
                 stop: stop.signal,
-                onPage: (progress) => {
+                onPage: (page) => {
                     if (jobId)
-                        updateJob(jobs, jobId, { progress: { ...progress, at: new Date().toISOString() } });
+                        updateJob(jobs, jobId, { progress: { ...page, at: new Date().toISOString() } });
+                    if (chat !== undefined)
+                        progress({ chats: null, chats_done: null, fetched: page.fetched });
                 },
+                onChat: ({ chats, done, fetched }) => progress({ chats, chats_done: done, fetched }, done === 0 || done === chats),
             };
             const result = await context.withServices((services) => chat === undefined ? services.archive.fetchAll(options) : services.archive.fetch(chat, options));
             if (jobId)
@@ -197,6 +204,22 @@ export const syncCommand = (messenger) => {
         }
     });
 };
+/** At most this often a progress line, so a run of fast pages or of chats already current does not flood the window. */
+const PROGRESS_EVERY_MS = 500;
+/**
+ * `messages sync`'s progress for a window to draw a bar by: counts only, because the lines reach a desktop app and
+ * its logs — never a chat's id or title. `always` keeps the first and the last line of `--all` through the throttle.
+ */
+const syncProgress = (emit) => {
+    let last = Number.NEGATIVE_INFINITY;
+    return (counts, always = false) => {
+        const now = Date.now();
+        if (!always && now - last < PROGRESS_EVERY_MS)
+            return;
+        last = now;
+        emit({ event: "progress", step: "sync", ...counts });
+    };
+};
 /**
  * What the sync stored, through the task rules (owner, 2026-10-14). A failure is noted, never the sync's failure:
  * the messages are already kept, and the next sync's pass starts from the same stop point.

package/dist/oauth/keeper.js

@@ -137,13 +137,13 @@ export const tokenKeeper = (options) => {
             const extra = (await accept?.(received)) ?? undefined;
             await locked(async () => {
                 forget();
-                storage.write({ tokens: received, client, ...(extra ? { extra } : {}) });
+                storage.write({ tokens: received, client, ...(extra ? { extra } : {}) }, { signIn: true });
             });
             return { scopes: received.scopes };
         },
         save: (saved, extra) => locked(async () => {
             forget();
-            storage.write({ tokens: saved, client: clientOf(storage.read()), ...(extra ? { extra } : {}) });
+            storage.write({ tokens: saved, client: clientOf(storage.read()), ...(extra ? { extra } : {}) }, { signIn: true });
         }),
         signOut: ({ revoke = false } = {}) => locked(async () => {
             forget();

package/dist/oauth/storage.d.ts

@@ -1,4 +1,4 @@
-import { type CredentialSource, type CredentialsOptions } from "@wirecat/cli-base";
+import { type CredentialSource, type CredentialsOptions, type WriteOptions } from "@wirecat/cli-base";
 import type { OAuthClient, TokenSet } from "./provider.js";
 export interface StoredTokens {
     tokens: TokenSet;
@@ -29,7 +29,8 @@ export interface TokenStorage {
     /** Throws when the entry cannot be saved, so a sign-in fails before the browser, not after consent. */
     probe(): void;
     read(): StoredTokens | undefined;
-    write(input: Omit<EncodeInput, "previous">): void;
+    /** `signIn` moves an entry the file holds back to the keyring when it takes it (WC-SECR-4); a refresh leaves it. */
+    write(input: Omit<EncodeInput, "previous">, options?: WriteOptions): void;
     remove(): CredentialSource[];
 }
 export declare const oauthAccount: (providerId: string, profile: string) => string;

package/dist/oauth/storage.js

@@ -162,9 +162,9 @@ export const credentialStorage = (options) => {
             throw keyringFailure(error);
         }
     };
-    const save = (value) => {
+    const save = (value, writeOptions) => {
         try {
-            credentials.write(account, value);
+            credentials.write(account, value, writeOptions);
         }
         catch (error) {
             throw keyringFailure(error, value);
@@ -195,7 +195,7 @@ export const credentialStorage = (options) => {
             const value = current();
             return value === undefined ? undefined : codec.decode(value);
         },
-        write: (input) => save(codec.encode({ ...input, previous: raw(account) })),
+        write: (input, writeOptions) => save(codec.encode({ ...input, previous: raw(account) }), writeOptions),
         remove: () => {
             try {
                 return credentials.remove(account);

package/dist/services/archive.d.ts

@@ -39,6 +39,12 @@ export interface FetchOptions {
         chatId: string;
         oldest: number;
     }) => void;
+    /** `fetchAll` only: once the chat list is read, then after each chat, current or not; counts across every chat. */
+    onChat?: (progress: {
+        chats: number;
+        done: number;
+        fetched: number;
+    }) => void;
 }
 /** A type, not an interface: a job keeps it as a plain record. */
 export type Fetched = {

package/dist/services/archive.js

@@ -148,6 +148,8 @@ export const archiveService = (deps) => {
                 ...options,
                 catchUp: catchingUp ? (options.catchUp ?? {}) : false,
             });
+            const finished = () => options.onChat?.({ chats: chats.length, done: answer.items.length, fetched: answer.fetched });
+            finished();
             for (const chat of chats) {
                 if (options.stop.aborted || batch.stopped) {
                     answer.stopped = true;
@@ -155,6 +157,7 @@ export const archiveService = (deps) => {
                 }
                 if (await upToDate(chat)) {
                     answer.items.push({ chat: chat.id, title: chat.title, fetched: 0, complete: true, current: true });
+                    finished();
                     continue;
                 }
                 try {
@@ -183,6 +186,7 @@ export const archiveService = (deps) => {
                     const issue = batch.fail(chat.id, "history", error);
                     answer.items.push({ chat: chat.id, title: chat.title, fetched: 0, complete: false, error: issue.code, issue });
                 }
+                finished();
             }
             if (batch.failed > 0)
                 answer.batch = batch.result();

package/dist/terminal/sign-in-steps.js

@@ -2,6 +2,7 @@ import { StringDecoder } from "node:string_decoder";
 import { CliError } from "@wirecat/cli-base";
 import { Option } from "commander";
 import { MAX_SECRET_INPUT } from "../cli/input-policy.js";
+import { stepLines } from "./step-lines.js";
 /**
  * Opt-in, because a read nobody answers hangs: an agent running `session start` in a shell must get the refusal it
  * gets today, and only a caller that holds stdin open and answers each `needs` line (WireCat Desktop) passes it.
@@ -10,10 +11,7 @@ export const answerStdinOption = () => new Option("--answer-stdin", "with --json
 export const signInSteps = ({ diagnostic, json, answers, input = process.stdin }) => {
     if (answers && !json)
         throw new CliError("validation_error", "--answer-stdin needs --json");
-    const emit = (event) => {
-        if (json)
-            diagnostic(JSON.stringify(event));
-    };
+    const emit = stepLines(diagnostic, json);
     const next = answers ? lineReader(input) : undefined;
     return {
         json,

package/dist/terminal/step-lines.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Machine-readable step lines: one JSON object per line on the diagnostic stream, only in `--json` / `--jsonl`, so
+ * stdout keeps its single answer and a person at a terminal sees nothing new. Sign-in and `messages sync` share it.
+ */
+export declare const stepLines: (diagnostic: (line: string) => void, json: boolean) => (event: Record<string, unknown> & {
+    event: string;
+}) => void;

package/dist/terminal/step-lines.js

@@ -0,0 +1,8 @@
+/**
+ * Machine-readable step lines: one JSON object per line on the diagnostic stream, only in `--json` / `--jsonl`, so
+ * stdout keeps its single answer and a person at a terminal sees nothing new. Sign-in and `messages sync` share it.
+ */
+export const stepLines = (diagnostic, json) => (event) => {
+    if (json)
+        diagnostic(JSON.stringify(event));
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wirecat/cli-core",
-  "version": "0.506.0",
+  "version": "0.507.0",
   "description": "The messenger-neutral half of a messaging CLI: domain model, message locators, rendering, name resolution, the SQLite seam, the command skeleton and shared read commands, the send guard, run records and the message store",
   "license": "Apache-2.0",
   "author": "Viacheslav Ptsarev",
@@ -247,7 +247,7 @@
     "@types/node": "^22.20.5",
     "@types/pngjs": "6.0.5",
     "@vitest/coverage-v8": "^5.0.5",
-    "@wirecat/cli-base": "0.67.0",
+    "@wirecat/cli-base": "0.68.0",
     "@wirecat/cli-core-legacy-tags": "npm:@wirecat/cli-core@0.414.0",
     "commander": "15.0.0",
     "cspell": "10.4.0",
@@ -267,7 +267,7 @@
   },
   "peerDependencies": {
     "@napi-rs/canvas": ">=0.1.69 <2",
-    "@wirecat/cli-base": ">=0.67.0 <0.68.0",
+    "@wirecat/cli-base": ">=0.68.0 <0.69.0",
     "commander": ">=15"
   },
   "bin": {