dsh-agy-link 0.4.32 → 0.4.33

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 0.4.33 (2026-09-18)
+
+### English
+
+- **Fix: thinking / tool-args invisible for pool accounts.** agy conversation SQLite DBs for isolated accounts live under `~/.dsh/agy-accounts/<id>/.gemini/antigravity-cli/conversations`, not system `~/.gemini`. The reader now searches the run's account home, `GEMINI_CLI_HOME`, system home, and pool account dirs.
+- **Fix: `/agy status` could hang the command UI.** Auth probe is now bounded (8s) so command results always return (issue #29 symptom).
+
+### 中文 (Chinese)
+
+- **修复：号池隔离账号看不到思维链/工具参数** — 会话库在账号自己的 HOME 下，读取时会搜索账号目录。
+- **修复：`/agy status` 可能挂起导致命令无输出** — 探测加 8s 超时。
+
 ## 0.4.32 (2026-09-17)
 
 ### English

package/dist/index.js

@@ -400,6 +400,8 @@ var RunRecording = class {
 	fullArgs = null;
 	/** DB-resolved thoughts keyed by event index (set during span driving). */
 	thoughts = null;
+	/** Isolated pool-account HOME used for this run's agy conversation DB. */
+	accountHome = void 0;
 	/**
 	* Set by the adapter right after spawn. A mid-turn user steer makes DSH
 	* open a NEW stream() call for the same session while this run's process
@@ -2228,6 +2230,43 @@ async function probeProcess(bin, args, timeoutMs = 3e4, signal, env) {
 //#region src/host/agy-db.ts
 const execFileAsync = promisify(execFile);
 let AGY_DB_DIR = join(homedir(), ".gemini", "antigravity-cli", "conversations");
+/**
+* Candidate conversations directories for a conversation id.
+* Pool/isolated accounts write agy state under their own HOME
+* (~/.dsh/agy-accounts/<id>/.gemini/...), NOT the system ~/.gemini
+* (issue: thinking/tool-args invisible when using isolated accounts).
+*/
+function conversationsDirCandidates(accountHome) {
+	const dirs = [];
+	const push = (d) => {
+		if (!dirs.includes(d)) dirs.push(d);
+	};
+	if (accountHome !== void 0 && accountHome !== "") push(join(accountHome, ".gemini", "antigravity-cli", "conversations"));
+	const gch = process.env.GEMINI_CLI_HOME;
+	if (gch !== void 0 && gch !== "") push(join(gch, "antigravity-cli", "conversations"));
+	push(AGY_DB_DIR);
+	push(join(homedir(), ".gemini", "antigravity-cli", "conversations"));
+	const poolBase = join(homedir(), ".dsh", "agy-accounts");
+	try {
+		for (const ent of readdirSync(poolBase)) {
+			if (ent.startsWith(".")) continue;
+			push(join(poolBase, ent, ".gemini", "antigravity-cli", "conversations"));
+		}
+	} catch {}
+	return dirs;
+}
+/** Locate an existing conversation DB across system + pool homes. */
+function findConversationDb(conversationId, accountHome) {
+	if (!isSafeConversationId(conversationId)) return null;
+	const name = `${conversationId}.db`;
+	for (const dir of conversationsDirCandidates(accountHome)) {
+		const p = join(dir, name);
+		try {
+			if (existsSync(p)) return p;
+		} catch {}
+	}
+	return null;
+}
 const TOOL_STEP_TYPES = /* @__PURE__ */ new Set([
 	5,
 	7,
@@ -2333,7 +2372,7 @@ function extractStepThoughts(payload) {
 * Copy the agy SQLite DB to a temp path (avoiding WAL lock issues), then
 * query tool and thought step payloads via sqlite3 CLI.
 */
-async function loadAgyDbData(conversationId) {
+async function loadAgyDbData(conversationId, accountHome) {
 	const steps = /* @__PURE__ */ new Map();
 	const thoughts = /* @__PURE__ */ new Map();
 	const seenSteps = /* @__PURE__ */ new Set();
@@ -2342,20 +2381,12 @@ async function loadAgyDbData(conversationId) {
 		thoughts,
 		seenSteps
 	};
-	const dbPath = join(AGY_DB_DIR, `${conversationId}.db`);
-	try {
-		if ((await stat(dbPath)).size === 0) return {
-			steps,
-			thoughts,
-			seenSteps
-		};
-	} catch {
-		return {
-			steps,
-			thoughts,
-			seenSteps
-		};
-	}
+	const dbPath = findConversationDb(conversationId, accountHome);
+	if (dbPath === null) return {
+		steps,
+		thoughts,
+		seenSteps
+	};
 	const tmpDb = join(tmpdir(), `agy-db-${conversationId.slice(0, 8)}-${Date.now()}.db`);
 	try {
 		await copyFile(dbPath, tmpDb);
@@ -2531,7 +2562,7 @@ function scanFallbackJson(payload) {
 * Results are cached per conversationId for up to 5 minutes to avoid
 * repeated DB reads within the same session.
 */
-async function readFullToolArgs(conversationId, stepIndex) {
+async function readFullToolArgs(conversationId, stepIndex, accountHome) {
 	if (!isSafeConversationId(conversationId)) return null;
 	const now = Date.now();
 	if (cache?.conversationId === conversationId && cache.loaded && now - cacheTime < MAX_CACHE_AGE_MS) {
@@ -2539,7 +2570,7 @@ async function readFullToolArgs(conversationId, stepIndex) {
 		if (cached !== void 0) return cached;
 		if (cache.checkedSteps.has(stepIndex)) return null;
 	}
-	const data = await loadAgyDbData(conversationId);
+	const data = await loadAgyDbData(conversationId, accountHome);
 	cache = {
 		conversationId,
 		steps: data.steps,
@@ -2555,7 +2586,7 @@ async function readFullToolArgs(conversationId, stepIndex) {
 * conversation database. Returns null when the DB is unavailable or the
 * step does not contain thought text.
 */
-async function readStepThoughts(conversationId, stepIndex) {
+async function readStepThoughts(conversationId, stepIndex, accountHome) {
 	if (!isSafeConversationId(conversationId)) return null;
 	const now = Date.now();
 	if (cache?.conversationId === conversationId && cache.loaded && now - cacheTime < MAX_CACHE_AGE_MS) {
@@ -2563,7 +2594,7 @@ async function readStepThoughts(conversationId, stepIndex) {
 		if (cached !== void 0) return cached;
 		if (cache.checkedSteps.has(stepIndex)) return null;
 	}
-	const data = await loadAgyDbData(conversationId);
+	const data = await loadAgyDbData(conversationId, accountHome);
 	cache = {
 		conversationId,
 		steps: data.steps,
@@ -2964,6 +2995,7 @@ var AgyAdapter = class extends LlmAdapter {
 		}
 		const before = snapshotConversations();
 		const rec = this.deps.runs.create();
+		rec.accountHome = account && account.dir ? account.dir : void 0;
 		const parser = new StreamJsonParser();
 		this.deps.onParser?.(parser);
 		let streamCid = null;
@@ -3179,10 +3211,10 @@ var AgyAdapter = class extends LlmAdapter {
 						const activeConvId = rec.conversationId ?? (typeof rawObj?.conversation_id === "string" ? rawObj.conversation_id : null) ?? (typeof stepUpdate?.conversation_id === "string" ? stepUpdate.conversation_id : null);
 						const stepIdx = parseInt(ev.stepKey, 10);
 						if (activeConvId !== null && Number.isFinite(stepIdx)) try {
-							let th = await readStepThoughts(activeConvId, stepIdx);
+							let th = await readStepThoughts(activeConvId, stepIdx, rec.accountHome);
 							if (th === null && (ev.state === "DONE" || (ev.usage?.thinking_tokens ?? 0) > 0 || ev.stepKind === "thinking")) {
 								await new Promise((r) => setTimeout(r, 50));
-								th = await readStepThoughts(activeConvId, stepIdx);
+								th = await readStepThoughts(activeConvId, stepIdx, rec.accountHome);
 							}
 							if (th !== null && th.trim() !== "") {
 								resolvedThoughts.set(i, th);
@@ -3196,10 +3228,10 @@ var AgyAdapter = class extends LlmAdapter {
 						const activeConvId = rec.conversationId ?? (typeof rawObj?.conversation_id === "string" ? rawObj.conversation_id : null) ?? (typeof stepUpdate?.conversation_id === "string" ? stepUpdate.conversation_id : null);
 						const stepIdx = parseInt(ev.stepKey, 10);
 						if (activeConvId !== null && Number.isFinite(stepIdx)) try {
-							let full = await readFullToolArgs(activeConvId, stepIdx);
+							let full = await readFullToolArgs(activeConvId, stepIdx, rec.accountHome);
 							if (full === null) {
 								await new Promise((r) => setTimeout(r, 50));
-								full = await readFullToolArgs(activeConvId, stepIdx);
+								full = await readFullToolArgs(activeConvId, stepIdx, rec.accountHome);
 							}
 							if (full !== null && full.args !== void 0) {
 								resolved.set(i, full.args);
@@ -27685,7 +27717,7 @@ async function renderStatus(deps) {
 	const cfg = deps.cfg();
 	const bin = deps.bin();
 	const authHelper = deps.auth();
-	const auth = authHelper ? await authHelper.resolvedStatus() : void 0;
+	const auth = authHelper ? await Promise.race([authHelper.resolvedStatus(), new Promise((r) => setTimeout(() => r(void 0), 8e3))]) : void 0;
 	const cat = deps.catalog().get();
 	const bindings = Object.keys(deps.store().all()).length;
 	const last = deps.lastRun();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-agy-link",
-  "version": "0.4.32",
+  "version": "0.4.33",
   "description": "Google Antigravity (agy CLI) models for DeepSeek Harness — stream Gemini/Claude/GPT-OSS subscriptions into DSH with thinking, tool activity, token usage and in-GUI Google OAuth login.",
   "type": "module",
   "license": "MIT",