strom-research 1.25.1 → 1.25.2

package/dist/commands/sources.js

@@ -1,6 +1,6 @@
 // source · cite · repo · recordset · place — where the evidence comes from.
 import { OFF_MAP_HOW, offMapLine, placesOffMap } from "../core/places.js";
-import { addPlaceName, otherNames, personsHand } from "../core/placeid.js";
+import { addPlaceName, nameWithSyntax, otherNames, parseAltName, personsHand } from "../core/placeid.js";
 import { isAgent } from "../core/which.js";
 import fs from "node:fs";
 import { commands, register } from "../cli/registry.js";
@@ -73,17 +73,7 @@ function clipRefs(tree, specs, shared) {
 }
 /** "Teinitz an der Elbe@de:1850-1918" → another name of a place. */
 export function altName(a) {
-    const m = /^(.+?)(?:@([a-z]{2,3}))?(?::(\d{3,4})?-(\d{3,4})?)?$/.exec(a);
-    if (!m)
-        throw new UsageError(`invalid --alt "${a}"`, { hint: 'e.g. "Teinitz an der Elbe@de:1850-1918"' });
-    const n = { name: m[1].trim() };
-    if (m[2])
-        n.lang = m[2];
-    if (m[3])
-        n.from = Number(m[3]);
-    if (m[4])
-        n.to = Number(m[4]);
-    return n;
+    return parseAltName(a);
 }
 /**
  * An edit: only the options given change; --note adds a note. Overwriting a
@@ -598,7 +588,9 @@ register({
     examples: ['strom place add "Týnec nad Labem" --alt "Teinitz an der Elbe@de" --kind town --lat 50.042 --lon 15.358', 'strom place add "Lhota" --kind village --unlocated "which Lhota: the record gives no parish"'],
     run(ctx, { args, opts }) {
         const tree = ctx.tree();
-        const named = { names: [{ name: args[0].trim() }] };
+        // the name written with the syntax of another name ("Lhotau@de:1850"): its name, language and years, never kept whole
+        const first = { name: args[0].normalize("NFC").trim() };
+        const named = { names: [nameWithSyntax(first) ?? first] };
         for (const n of listOpt(opts.alt).map(altName))
             addPlaceName(named, n.name, "alt", n);
         const names = named.names;

package/dist/commands/start.js

@@ -42,7 +42,7 @@ import { phrase } from "../core/phrases.js";
 import { imageSettings, qualityIn, writeGedcoms, writeTreeGed } from "./output.js";
 import { shortcutName } from "../cli/wizard.js";
 import { refuseInArchive } from "../core/state.js";
-import { claudeStateFile } from "../core/claudedir.js";
+import { claudeStateFile, saysDefaultClaudeDir } from "../core/claudedir.js";
 /** Has the user trusted this folder in Claude Code already? (Its own record, read only.) */
 function claudeTrusts(root, env) {
     const file = claudeStateFile(env);
@@ -233,7 +233,10 @@ register({
         const agentEnv = conversationEnv(agent, ctx.env);
         if (opts.print) {
             const vars = Object.entries(agentEnv).map(([k, v]) => `${k}=${shellQuote(v)}`);
-            return { text: [...(vars.length && process.platform !== "win32" ? ["env", ...vars] : []), ...[program ?? profile.command, ...args].map(shellQuote)].join(" "), data: { command: program ?? profile.command, args, cwd: tree.root, ...(vars.length ? { env: agentEnv } : {}) } };
+            // Claude Code's default folder said outright: the conversation goes without it, as every `claude` of strom (forClaude)
+            const unset = agent === "claude" && saysDefaultClaudeDir(ctx.env) ? ["CLAUDE_CONFIG_DIR"] : [];
+            const envLine = (vars.length || unset.length) && process.platform !== "win32" ? ["env", ...unset.flatMap((k) => ["-u", k]), ...vars] : [];
+            return { text: [...envLine, ...[program ?? profile.command, ...args].map(shellQuote)].join(" "), data: { command: program ?? profile.command, args, cwd: tree.root, ...(vars.length ? { env: agentEnv } : {}), ...(unset.length ? { unset } : {}) } };
         }
         // Other agents may work in this tree too: this one gets a name of its own, is present while it
         // works, and has its own session. Sessions of conversations that ended without closing are closed.

package/dist/commands/sync.js

@@ -16,7 +16,7 @@ import { decodeText, safeFolderName } from "../core/text.js";
 import { humanAge } from "../core/age.js";
 import { now, Tree } from "../core/tree.js";
 import { actsAsArchive } from "../core/state.js";
-import { applySync, discardReceived, nothingSince, withoutImages, planSync, readTreeFile, receivedAll, receivedPending, receivedSince, receivedOf, removedByItsDecision, settleReceived, SYNC_INBOX, syncConflicts, undoReceived, undoSync } from "../core/sync.js";
+import { applySync, houseWords, discardReceived, nothingSince, withoutImages, planSync, readTreeFile, receivedAll, receivedPending, receivedSince, receivedOf, removedByItsDecision, settleReceived, SYNC_INBOX, syncConflicts, undoReceived, undoSync } from "../core/sync.js";
 import { labels } from "../gedcom/labels.js";
 import { startLive } from "../core/live.js";
 import { appSendsChanges, sendAppUrl, stromAppUrl } from "../core/stromapp.js";
@@ -67,7 +67,7 @@ function detailText(f, lang, name = (k) => k) {
     if (!f)
         return "";
     const ages = Object.entries(f.ages ?? {}).map(([who, a]) => `${name(who)} ${humanAge(a, lang)}`);
-    return [f.house && ui(lang, "ui.sync.house", { x: f.house }), f.age && humanAge(f.age, lang), ...ages, f.cause && ui(lang, "ui.sync.cause", { x: f.cause })].filter(Boolean).join(", ");
+    return [f.house && houseWords(lang, f.house), f.age && humanAge(f.age, lang), ...ages, f.cause && ui(lang, "ui.sync.cause", { x: f.cause })].filter(Boolean).join(", ");
 }
 /** A position on the map as a map shows it: degrees, six decimals at most. */
 const point = (p) => `${+p.lat.toFixed(6)}, ${+p.lon.toFixed(6)}`;

package/dist/core/claudedir.js

@@ -4,14 +4,33 @@
 // asks its usage, a list of its models) gets the folder in its environment (claudeEnv), and what strom reads or writes
 // of Claude Code's own (transcripts, its settings, its skill, its record of trusted folders) is read there.
 // Only Claude Code: the other agents keep their own folders.
+//
+// Its default folder said outright (CLAUDE_CONFIG_DIR=~/.claude) is not the default to Claude Code: it looks for its
+// login under another name (macOS: the keychain's "Claude Code-credentials-<hash>") and is not logged in there, its
+// `claude -p /usage` a bare /cost (found 2026-11-03: a run stopped before its first session). So the default said is
+// no folder said: every `claude` strom starts goes without the variable (forClaude), as the plain `claude` the person
+// logged in with.
 import path from "node:path";
+import { spawnSync } from "node:child_process";
 import { loadUserConfig, Settings } from "./config.js";
-import { userHome } from "./paths.js";
-/** The folder said outright — CLAUDE_CONFIG_DIR, else agent.claudeConfigDir (absolute, ~ expanded) — or undefined: Claude Code's own default. */
+import { expandHome, userHome } from "./paths.js";
+import { findAgent } from "./which.js";
+/** Is this folder Claude Code's own default, ~/.claude (with a separator at the end, ~ unexpanded; case aside where the disk ignores it)? */
+export function isDefaultClaudeDir(dir, env) {
+    const norm = (p) => {
+        const r = path.resolve(p);
+        return process.platform === "linux" ? r : r.toLowerCase();
+    };
+    return norm(expandHome(dir.trim(), env)) === norm(path.join(userHome(env), ".claude"));
+}
+/**
+ * The folder said outright — CLAUDE_CONFIG_DIR, else agent.claudeConfigDir (absolute, ~ expanded) — or undefined:
+ * Claude Code's own default (also when the default is what is said: isDefaultClaudeDir).
+ */
 export function claudeConfigSet(env, config) {
     const r = new Settings(env, {}, config ?? loadUserConfig(env)).resolve("agent.claudeConfigDir");
     const v = r && typeof r.value === "string" ? r.value.trim() : "";
-    return v || undefined;
+    return v && !isDefaultClaudeDir(v, env) ? v : undefined;
 }
 /** Claude Code's folder: the one said (claudeConfigSet), else ~/.claude (`home`: another home folder than env's). */
 export function claudeConfigDir(env, config, home) {
@@ -32,7 +51,44 @@ export function claudeEnv(env, config) {
     const set = claudeConfigSet(env, config);
     return set ? { CLAUDE_CONFIG_DIR: set } : {};
 }
+/** Does env say Claude Code's default folder outright (CLAUDE_CONFIG_DIR=~/.claude), which a `claude` of strom goes without? */
+export function saysDefaultClaudeDir(env) {
+    return Boolean(env.CLAUDE_CONFIG_DIR?.trim()) && isDefaultClaudeDir(env.CLAUDE_CONFIG_DIR, env);
+}
+/**
+ * The whole environment of a `claude` strom starts: env with the folder of the setting (claudeEnv), and without
+ * CLAUDE_CONFIG_DIR when it says the default folder — a plain `claude`, logged in as the person logged in.
+ */
+export function forClaude(env, config) {
+    const out = { ...env, ...claudeEnv(env, config) };
+    if (saysDefaultClaudeDir(env))
+        delete out.CLAUDE_CONFIG_DIR;
+    return out;
+}
+/** How to log Claude Code in for strom's `claude` (its folder said, when one is): what a person runs once. */
+export function claudeLoginCommand(env, config) {
+    const set = claudeConfigSet(env, config);
+    if (!set)
+        return "claude";
+    return process.platform === "win32" ? `claude (CLAUDE_CONFIG_DIR=${set})` : `CLAUDE_CONFIG_DIR='${set.replace(/'/g, "'\\''")}' claude`;
+}
 /** Is this command Claude Code's (claude, claude.cmd, a path to it)? */
 export function isClaudeCommand(command) {
     return /^claude(?:\.(?:cmd|exe|bat))?$/iu.test(path.basename(command));
 }
+/**
+ * Is the `claude` strom starts logged in (`claude auth status`, in its environment: forClaude)? false only when it says
+ * so; undefined when it cannot tell (an older Claude Code, a stand-in, no answer in time) — then nothing is decided by it.
+ */
+export function claudeLoggedIn(env, command = "claude") {
+    const program = findAgent(command, env) ?? command;
+    const shell = process.platform === "win32" && /\.(cmd|bat)$/i.test(program);
+    try {
+        const r = spawnSync(shell ? `"${program}"` : program, ["auth", "status"], { env: forClaude(env), encoding: "utf8", timeout: 20_000, stdio: ["ignore", "pipe", "ignore"], windowsHide: true, shell });
+        const said = JSON.parse((r.stdout ?? "").trim());
+        return typeof said?.loggedIn === "boolean" ? said.loggedIn : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}

package/dist/core/gate.js

@@ -19,7 +19,7 @@ import { StromError, UsageError } from "./errors.js";
 import { NAME_RE, pluginsDir } from "./connector.js";
 import { readAsset } from "./assets.js";
 import { ui } from "../cli/ui.js";
-import { claudeEnv } from "./claudedir.js";
+import { forClaude } from "./claudedir.js";
 export const GATE_INTERFACE = 1;
 const MANIFEST = "gate.json";
 /** How long a gate may think (it may ask a service). */
@@ -168,9 +168,9 @@ export function askGate(gate, env, facts) {
         timeout,
         windowsHide: true,
         env: {
-            ...inherited,
             // a gate that asks Claude Code (claude-usage) asks the one of agent.claudeConfigDir, as the runs it decides about
-            ...claudeEnv(inherited),
+            // (and the default folder said outright: none — a plain `claude`, logged in)
+            ...forClaude(inherited),
             STROM_GATE: gate.name,
             STROM_TREE: facts.tree,
             STROM_LANG: facts.lang,

package/dist/core/people.js

@@ -611,7 +611,7 @@ export function claimText(tree, c, claim) {
     const ofApp = !!(c.edit || c.parents || c.claims.some((x) => x.note === "the user's edit"));
     // a title cut at its length says one side no more
     if (ofApp && c.claims.length === 2 && i >= 0 && c.title.length < 200) {
-        const m = / — (.*) × (.*)$/s.exec(conflictTitle(tree, c));
+        const m = / [—–] (.*) × (.*)$/s.exec(conflictTitle(tree, c));
         if (m && !m[1].includes(" × "))
             return m[i + 1];
     }

package/dist/core/phrases.js

@@ -89,6 +89,12 @@ export const PHRASES = {
     "places.identify.why": "The person asked: which place of the name each is, where it lies, its names and jurisdictions — for the map, the history and the houses.",
     "places.identify.done": "Every place of the queue identified, asked about or found not located.",
     "places.identify.result": "every place of the queue identified, asked about or found not located",
+    "places.count.identified": "identified {n}",
+    "places.count.verified": "verified {n} (already identified, checked)",
+    "places.count.undecided": "checked, undecided {n}",
+    "places.count.asked": "with a question {n}",
+    "places.count.unlocated": "not located {n}",
+    "places.count.merged": "merged {n}",
     "history.region.what": "Events of history in {region}: wars, epidemics, censuses, changes of the state, emigration",
     "history.region.where": "encyclopedias, state institutions, archives, the Wikipedia of the region's language with its references",
     "history.region.why": "what the ancestors lived through, shown with their lives",