@deepseek-harness-tui/dsh-tui 0.13.0 → 0.14.0

package/lib/types/dsh-adapter/migrate/parse/jsonl.d.ts

@@ -9,20 +9,5 @@
  *
  * @module @deepseek-harness-tui/dsh-tui/migrate/parse/jsonl
  */
-/** A decoded JSON object row. */
-export type JsonRecord = Record<string, unknown>;
-/** Narrow an unknown JSON value to an object record (rejects `null` and arrays). */
-export declare function isRecord(value: unknown): value is JsonRecord;
-/** Parsed rows of one JSONL document. */
-export interface JsonlRows {
-    readonly records: readonly JsonRecord[];
-    /** Non-empty lines that were not valid JSON. */
-    readonly badLines: number;
-}
-/**
- * Split and decode a JSONL document.
- * @param raw - Whole file text; `\n` and `\r\n` line ends are both accepted.
- * @returns Every object row in file order plus the count of unparseable lines.
- */
-export declare function parseJsonl(raw: string): JsonlRows;
+export { isRecord, parseJsonl, type JsonlRows, type JsonRecord } from '../../../utils/jsonl.js';
 //# sourceMappingURL=jsonl.d.ts.map

package/lib/types/dsh-adapter/migrate/parse/jsonl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jsonl.d.ts","sourceRoot":"","sources":["../../../../../src/dsh-adapter/migrate/parse/jsonl.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,iCAAiC;AACjC,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;AAEhD,oFAAoF;AACpF,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,UAAU,CAE5D;AAED,yCAAyC;AACzC,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,OAAO,EAAE,SAAS,UAAU,EAAE,CAAA;IACvC,gDAAgD;IAChD,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;CAC1B;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAgBjD"}
+{"version":3,"file":"jsonl.d.ts","sourceRoot":"","sources":["../../../../../src/dsh-adapter/migrate/parse/jsonl.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAIH,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,KAAK,SAAS,EAAE,KAAK,UAAU,EAAE,MAAM,yBAAyB,CAAA"}

package/lib/types/dsh-adapter/migrate/parse/jsonl.js

@@ -9,32 +9,6 @@
  *
  * @module @deepseek-harness-tui/dsh-tui/migrate/parse/jsonl
  */
-/** Narrow an unknown JSON value to an object record (rejects `null` and arrays). */
-export function isRecord(value) {
-    return value !== null && typeof value === 'object' && !Array.isArray(value);
-}
-/**
- * Split and decode a JSONL document.
- * @param raw - Whole file text; `\n` and `\r\n` line ends are both accepted.
- * @returns Every object row in file order plus the count of unparseable lines.
- */
-export function parseJsonl(raw) {
-    const records = [];
-    let badLines = 0;
-    for (const line of raw.split('\n')) {
-        const text = line.endsWith('\r') ? line.slice(0, -1) : line;
-        if (text.trim() === '')
-            continue;
-        let value;
-        try {
-            value = JSON.parse(text);
-        }
-        catch {
-            badLines += 1;
-            continue;
-        }
-        if (isRecord(value))
-            records.push(value);
-    }
-    return { records, badLines };
-}
+// The reader is shared with the Claude backend's transcript reader
+// (src/utils/jsonl.ts); re-exported here for the migration sources.
+export { isRecord, parseJsonl } from '../../../utils/jsonl.js';

package/lib/types/dsh-adapter/oauth-credential-source.d.ts

@@ -0,0 +1,34 @@
+/**
+ * The host side of a backend's OAuth credential (`BackendHost.oauthCredential`):
+ * the dsh-auth credential file, read and
+ * refreshed through dsh-auth's own public pieces — `CredentialFile` (whose
+ * `modify` serializes a refresh across requests and processes) and the
+ * provider's pi-ai OAuth flow (`refresh`). Nothing here runs a login (that
+ * stays dsh-auth's `/login` wizard) or logs token material.
+ *
+ * The file is the dsh-auth default location (`$DSH_AUTH_CREDENTIALS`, else
+ * `$DSH_HOME/dsh-auth/credentials.json`, else `~/.dsh/…`); a custom
+ * `credentialsFile` in the dsh-auth config row is not visible to this module
+ * — set `DSH_AUTH_CREDENTIALS` to the same path.
+ *
+ * The pi-ai catalog is loaded only when a refresh is actually due: a backend
+ * session whose token is still fresh never pays for it.
+ *
+ * A refresh is compare-and-swap: due only while the stored token is about to
+ * expire or is still the one the backend refused, re-checked under the
+ * credential file's lock right before the network call. Residual race: a
+ * writer that rotates the token WITHOUT that lock (outside dsh-auth's
+ * `CredentialFile`) can still interleave with a refresh here; closing it
+ * would need dsh-auth itself to version its credentials.
+ */
+import type { OAuthCredentialSource } from '../agent/backend.js';
+import { type StoredOAuthCredential } from './oauth/credentials.js';
+/** One token refresh (default: the provider's own pi-ai OAuth flow). */
+export type OAuthRefresh = (provider: string, credential: StoredOAuthCredential, signal: AbortSignal) => Promise<StoredOAuthCredential>;
+/** The dsh-auth credential of one provider as a backend credential source. */
+export declare function createOAuthCredentialSource(provider: string, options?: {
+    readonly file?: string;
+    readonly now?: () => number;
+    readonly refresh?: OAuthRefresh;
+}): OAuthCredentialSource;
+//# sourceMappingURL=oauth-credential-source.d.ts.map

package/lib/types/dsh-adapter/oauth-credential-source.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"oauth-credential-source.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/oauth-credential-source.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,OAAO,KAAK,EAAe,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AAC7E,OAAO,EAA8D,KAAK,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;AAE/H,wEAAwE;AACxE,MAAM,MAAM,YAAY,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,qBAAqB,EAAE,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,qBAAqB,CAAC,CAAA;AAqBvI,8EAA8E;AAC9E,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE;IAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,YAAY,CAAA;CAAO,GACrG,qBAAqB,CAyCvB"}

package/lib/types/dsh-adapter/oauth-credential-source.js

@@ -0,0 +1,66 @@
+import { asStoredCredential, CredentialFile, defaultCredentialsFile } from './oauth/credentials.js';
+/** The provider's pi-ai OAuth `refresh`, loaded on first use. */
+const piAiRefresh = async (provider, credential, signal) => {
+    const [{ adapterBuiltinProviders }, { oauthOf }] = await Promise.all([
+        import('./oauth/pi-ai.js'),
+        import('./oauth/profiles.js'),
+    ]);
+    const route = adapterBuiltinProviders().find(candidate => candidate.id === provider);
+    if (route === undefined)
+        throw new Error(`dsh-auth: the installed pi-ai catalog ships no provider "${provider}"`);
+    const refreshed = asStoredCredential(await oauthOf(route).refresh(credential, signal));
+    if (refreshed === undefined)
+        throw new Error(`dsh-auth: the ${provider} refresh returned an unusable credential`);
+    return refreshed;
+};
+/** Refresh this long before the token expires (a turn must not start on a
+ *  token that dies mid-request). */
+const REFRESH_MARGIN_MS = 5 * 60_000;
+/** Bound on one refresh round trip. */
+const REFRESH_TIMEOUT_MS = 60_000;
+/** The dsh-auth credential of one provider as a backend credential source. */
+export function createOAuthCredentialSource(provider, options = {}) {
+    const store = new CredentialFile(options.file ?? defaultCredentialsFile());
+    const now = options.now ?? Date.now;
+    const refresh = options.refresh ?? piAiRefresh;
+    const access = (value) => {
+        const credential = asStoredCredential(value);
+        return credential === undefined ? undefined : { access: credential.access, expires: credential.expires };
+    };
+    return {
+        async stored() {
+            return access(await store.read(provider)) !== undefined;
+        },
+        async fresh(request = {}) {
+            request.signal?.throwIfAborted();
+            // Due: about to expire, or still the very token the backend refused.
+            // A token that differs from the refused one was rotated by someone
+            // else (a fresh `/login`, another request's refresh): use it as is.
+            const due = (credential) => credential.expires - now() <= REFRESH_MARGIN_MS ||
+                (request.rejected !== undefined && credential.access === request.rejected);
+            const current = access(await store.read(provider));
+            request.signal?.throwIfAborted();
+            if (current === undefined)
+                return undefined;
+            if (!due(current))
+                return current;
+            // Re-read and refresh under the file's own lock (compare-and-swap): a
+            // concurrent dsh-auth request or another process that already rotated
+            // the token wins, and its credential is what comes back.
+            const next = await store.modify(provider, async (stored) => {
+                const credential = asStoredCredential(stored);
+                if (credential === undefined)
+                    return undefined;
+                if (!due({ access: credential.access, expires: credential.expires }))
+                    return undefined;
+                const timeout = AbortSignal.timeout(REFRESH_TIMEOUT_MS);
+                const signal = request.signal === undefined ? timeout : AbortSignal.any([request.signal, timeout]);
+                signal.throwIfAborted();
+                const refreshed = await refresh(provider, credential, signal);
+                signal.throwIfAborted();
+                return refreshed;
+            });
+            return access(next);
+        },
+    };
+}

package/lib/types/dsh-adapter/plugin.d.ts

@@ -2,6 +2,7 @@ import type { Agent } from '@deepseek-ai/dsh-agent';
 import type { Context } from '@deepseek-ai/cordis';
 import { Config } from './index.js';
 import { type RuntimeConfig } from './compat/settings.js';
+import { type CrashDetail } from '../utils/crashDetail.js';
 import { initialPromptFromCmdlineArgs } from './startup-args.js';
 import { render } from '../ui.js';
 export { initialPromptFromCmdlineArgs };
@@ -69,6 +70,37 @@ export declare function createExitFunnel(deps: {
     handleExit: (error?: unknown) => boolean;
     markTeardown: () => void;
 };
+/**
+ * The exit funnel's crash tail, separate so scripts/verify-shutdown-fallback
+ * can drive it with failing sinks:
+ *
+ *  - Diagnostics (serialization and every log sink) may fail: a throwing
+ *    getter or Proxy trap on the error, or a sink that throws, falls back to
+ *    unserializableCrashDetail and one more logging attempt. The funnel latch
+ *    is already set here, so an exception escaping would skip the rest.
+ *  - The resume markers (and the last-run record, via writeResumeMarkers)
+ *    and the terminal cleanup (finish, then disposeRootAndExit(1)) always
+ *    run, whatever happened to the diagnostics.
+ */
+export interface CrashExitDeps {
+    /** The crash value itself (may be hostile: throwing getters, Proxy traps). */
+    readonly error: unknown;
+    /** Serializer override (verify fault injection); default serializeCrashDetail. */
+    readonly serialize?: (error: unknown) => CrashDetail;
+    /** One-line error log (ctx.logger.error). */
+    readonly logError: (message: string) => void;
+    /** crash.log append (appendCrashLog). */
+    readonly appendLog: (detail: CrashDetail) => void;
+    /** restart.log one-line event (logRestartEvent). */
+    readonly logRestart: (event: string, data?: Record<string, unknown>) => void;
+    /** Debug log (logForDebugging). */
+    readonly logDebug: (message: string, data?: Record<string, unknown>) => void;
+    /** Resume markers; best effort, isolated from the diagnostics' fate. */
+    readonly writeResumeMarkers: () => void;
+    /** MUST-RUN terminal cleanup + exit(1) handoff (finishExit + dispose). */
+    readonly finish: (crashLine: string) => void;
+}
+export declare function runCrashExit(deps: CrashExitDeps): void;
 /**
  * Whether a user exit should leave the resume marker (and print the resume
  * hint). Must be judged against the LIVE session behind the channel, not the
@@ -83,13 +115,17 @@ export declare function createExitFunnel(deps: {
 export declare function isExitResumable(deps: {
     pendingCount: number;
     liveAgent: Agent | undefined;
-    startupAgent: Agent;
+    /** Undefined when the session runs on a non-DSH backend: its id is never
+     *  a DSH resume target. */
+    startupAgent: Agent | undefined;
 }): boolean;
 /**
  * Finish terminal I/O before handing control to a process-level exit action.
  * Exported for scripts/verify-shutdown-fallback.
  */
-export declare function finishExit(ctx: Context, instance: Awaited<ReturnType<typeof render>> | undefined, fullscreen: boolean, notice: string | undefined, stderrNotice: string | undefined, done: () => void): Promise<void>;
+export declare function finishExit(ctx: Context, instance: Awaited<ReturnType<typeof render>> | undefined, fullscreen: boolean, notice: string | undefined, stderrNotice: string | undefined, done: () => void, options?: {
+    keepAltScreen?: boolean;
+}): Promise<void>;
 /** Deferred runtime failures must restore the terminal and fail the process. */
 export declare function handleStartupError(ctx: Context, error: unknown): void;
 //# sourceMappingURL=plugin.d.ts.map

package/lib/types/dsh-adapter/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/plugin.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAe,MAAM,wBAAwB,CAAA;AAGhE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAGlD,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AACnC,OAAO,EAA+D,KAAK,aAAa,EAAE,MAAM,sBAAsB,CAAA;AA2BtH,OAAO,EAAE,4BAA4B,EAAE,MAAM,mBAAmB,CAAA;AAiChE,OAAO,EAAE,MAAM,EAAkC,MAAM,UAAU,CAAA;AAqCjE,OAAO,EAAE,4BAA4B,EAAE,CAAA;AAEvC;;;;;GAKG;AACH;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE;IAAE,eAAe,CAAC,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAEnG;AAGD;;;;;;;;;;;;GAYG;AACH,MAAM,MAAM,WAAW,GAAG,aAAa,GAAG,yBAAyB,GAAG,eAAe,CAAA;AAErF,wBAAgB,kBAAkB,CAChC,WAAW,UAAgC,EAC3C,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,WAAW,CASb;AAED,wBAAsB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,aAAa,EAAE,aAAa,CAAC,MAAM,CAAC,EAAE,WAAW,GAAE,OAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAmmDzH;AAmMD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE;IAAE,UAAU,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,IAAI,CAAA;CAAE,GAAG;IACjF;;;;;;OAMG;IACH,UAAU,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,OAAO,CAAA;IACxC,YAAY,EAAE,MAAM,IAAI,CAAA;CACzB,CAeA;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE;IACpC,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,KAAK,GAAG,SAAS,CAAA;IAC5B,YAAY,EAAE,KAAK,CAAA;CACpB,GAAG,OAAO,CAQV;AAgBD;;;GAGG;AACH,wBAAsB,UAAU,CAC9B,GAAG,EAAE,OAAO,EACZ,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,MAAM,CAAC,CAAC,GAAG,SAAS,EACxD,UAAU,EAAE,OAAO,EACnB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,IAAI,EAAE,MAAM,IAAI,GACf,OAAO,CAAC,IAAI,CAAC,CAmFf;AA4HD,gFAAgF;AAChF,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI,CAIrE"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/plugin.ts"],"names":[],"mappings":"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"}