gpt-connector 0.1.0 → 0.2.0

package/dist/src/cli.js

@@ -1,6 +1,8 @@
 #!/usr/bin/env node
 import { GptConnector } from "./connector.js";
+import { ConsultJobStore } from "./consult-job-store.js";
 import { ConnectorError } from "./errors.js";
+import { packageVersion } from "./version.js";
 function parseArgs(args) {
     const [command, ...rest] = args;
     const values = new Map();
@@ -10,10 +12,16 @@ function parseArgs(args) {
             throw new Error(`不明な引数: ${current}`);
         const key = current.slice(2);
         const next = rest[index + 1];
-        if (next === undefined || next.startsWith("--"))
+        const existing = values.get(key);
+        if (next === undefined || next.startsWith("--")) {
+            if (existing !== undefined)
+                throw new Error(`重複したflag: --${key}`);
             values.set(key, true);
+        }
         else {
-            values.set(key, next);
+            if (existing === true)
+                throw new Error(`値とflagを混在できません: --${key}`);
+            values.set(key, [...(existing ?? []), next]);
             index += 1;
         }
     }
@@ -21,15 +29,65 @@ function parseArgs(args) {
 }
 function stringArg(values, name) {
     const value = values.get(name);
-    return typeof value === "string" ? value : undefined;
+    if (value === undefined)
+        return undefined;
+    if (value === true || value.length !== 1)
+        throw new Error(`--${name}は1つの値が必要です。`);
+    return value[0];
+}
+function stringArgs(values, name) {
+    const value = values.get(name);
+    if (value === undefined)
+        return undefined;
+    if (value === true)
+        throw new Error(`--${name}には値が必要です。`);
+    return [...value];
+}
+function flagArg(values, name) {
+    const value = values.get(name);
+    if (value === undefined)
+        return false;
+    if (value !== true)
+        throw new Error(`--${name}は値なしflagです。`);
+    return true;
+}
+function writeJson(value) {
+    process.stdout.write(`${JSON.stringify(value, null, 2)}\n`);
 }
 async function main() {
     const { command, values } = parseArgs(process.argv.slice(2));
+    if (command === "--version" || command === "version") {
+        process.stdout.write(`${packageVersion}\n`);
+        return;
+    }
     const endpoint = stringArg(values, "endpoint") ?? "http://127.0.0.1:9223";
-    const connector = await GptConnector.connect({ endpoint });
+    const stateDirectory = stringArg(values, "state-directory") ??
+        process.env.GPT_CONNECTOR_STATE_DIR;
+    if (command === "sessions") {
+        const slug = stringArg(values, "slug");
+        if (slug === undefined)
+            throw new Error("sessionsには--slugが必要です。");
+        const store = new ConsultJobStore({ stateDirectory, readOnly: true });
+        await store.initialize();
+        try {
+            writeJson(store.get(slug));
+        }
+        finally {
+            store.close();
+        }
+        return;
+    }
+    if (command === "doctor" || command === "diagnostics") {
+        const diagnostics = await GptConnector.doctor({ endpoint, stateDirectory });
+        writeJson(diagnostics);
+        if (diagnostics.overall !== "ready")
+            process.exitCode = 1;
+        return;
+    }
+    const connector = await GptConnector.connect({ endpoint, stateDirectory });
     try {
         if (command === "models") {
-            process.stdout.write(`${JSON.stringify(await connector.models(), null, 2)}\n`);
+            writeJson(await connector.models());
             return;
         }
         if (command === "chat") {
@@ -42,10 +100,35 @@ async function main() {
                 effort: stringArg(values, "effort"),
                 keepOpen: false,
             });
-            process.stdout.write(`${JSON.stringify(result, null, 2)}\n`);
+            writeJson(result);
+            return;
+        }
+        if (command === "consult") {
+            const prompt = stringArg(values, "prompt");
+            const slug = stringArg(values, "slug");
+            if (prompt === undefined || slug === undefined) {
+                throw new Error("consultには--promptと--slugが必要です。");
+            }
+            writeJson(await connector.consult({
+                prompt,
+                slug,
+                files: stringArgs(values, "file"),
+                workspaceRoot: stringArg(values, "workspace-root"),
+                model: stringArg(values, "model"),
+                effort: stringArg(values, "effort"),
+                keepOpen: flagArg(values, "keep-open"),
+                dryRun: flagArg(values, "dry-run"),
+            }));
+            return;
+        }
+        if (command === "close") {
+            const sessionId = stringArg(values, "session-id");
+            if (sessionId === undefined)
+                throw new Error("closeには--session-idが必要です。");
+            writeJson(await connector.closeSession({ sessionId }));
             return;
         }
-        throw new Error("usage: gpt-connector models | chat --prompt <text> [--model <id>] [--effort <id>]");
+        throw new Error("usage: gpt-connector --version | models | doctor | chat --prompt <text> | consult --prompt <text> --slug <id> [--workspace-root <abs> --file <spec> ...] [--model <id> --effort <id>] [--dry-run] | sessions --slug <id> | close --session-id <uuid>");
     }
     finally {
         connector.close();

package/dist/src/cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/cli.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/cli.ts"],"names":[],"mappings":"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"}

package/dist/src/connector.d.ts

@@ -1,15 +1,20 @@
-import { type ChatInput, type ChatResult, type CloseInput, type CloseResult, type ModelCatalog } from "./contract.js";
+import { type ChatInput, type ChatResult, type CloseInput, type CloseResult, type ConnectorDiagnostics, type ConsultDryRunResult, type ConsultInput, type ConsultSnapshot, type ModelCatalog, type SessionsInput } from "./contract.js";
 export interface ConnectorOptions {
     readonly endpoint?: string;
     readonly operationTimeoutMs?: number;
     readonly pollIntervalMs?: number;
+    readonly stateDirectory?: string;
 }
 export declare class GptConnector {
     #private;
     private constructor();
     static connect(options?: ConnectorOptions): Promise<GptConnector>;
+    static doctor(options?: ConnectorOptions): Promise<ConnectorDiagnostics>;
     models(): Promise<ModelCatalog>;
+    diagnostics(): Promise<ConnectorDiagnostics>;
     chat(input: ChatInput): Promise<ChatResult>;
+    consult(input: ConsultInput): Promise<ConsultSnapshot | ConsultDryRunResult>;
+    sessions(input: SessionsInput): ConsultSnapshot;
     closeSession(input: CloseInput): Promise<CloseResult>;
     close(): void;
     shutdown(): Promise<void>;

package/dist/src/connector.js

@@ -1,13 +1,17 @@
+import { createHash } from "node:crypto";
 import { setTimeout as delay } from "node:timers/promises";
 import { z } from "zod";
+import { attachmentLimits, prepareAttachmentFiles, } from "./attachment-files.js";
 import { discoverRuntimeAssets, listLoadedAssetUrls } from "./asset-discovery.js";
 import { CdpClient, discoverChatGptTarget } from "./cdp.js";
-import { chatInputSchema, closeInputSchema, } from "./contract.js";
+import { chatInputSchema, closeInputSchema, consultInputSchema, sessionsInputSchema, } from "./contract.js";
+import { ConsultJobStore } from "./consult-job-store.js";
 import { ConnectorError, connectorErrorCodes, } from "./errors.js";
 import { validateModelSelection } from "./model-catalog.js";
 import { bridgeBuildId, createBridgeBootstrapExpression, createBridgeCallExpression, } from "./page-bridge.js";
 import { evaluateByValue } from "./runtime-evaluate.js";
 import { SessionRegistry } from "./session-registry.js";
+import { packageVersion } from "./version.js";
 const operationStartSchema = z.object({ operationId: z.string().uuid() });
 const operationErrorSchema = z.object({
     code: z.string(),
@@ -37,14 +41,42 @@ const chatResultSchema = z.object({
     resolvedEffort: z.string().nullable(),
     sessionId: z.string().uuid().optional(),
 });
+const attachmentSummarySchema = z.object({
+    count: z.number().int().nonnegative(),
+    names: z.array(z.string()),
+    mimeTypes: z.array(z.string().nullable()),
+    readBack: z.literal("confirmed"),
+    retention: z.literal("unknown"),
+    cleanup: z.enum(["not_supported", "failed", "deleted"]),
+});
+const bridgeChatResultSchema = chatResultSchema.extend({
+    attachments: attachmentSummarySchema,
+});
+const uploadHandleSchema = z.object({ uploadHandle: z.string().uuid() });
+const uploadChunkResultSchema = z.object({ receivedBytes: z.number().int().nonnegative() });
+const uploadResultSchema = z.object({
+    uploadHandle: z.string().uuid(),
+    name: z.string(),
+    size: z.number().int().positive(),
+    mimeType: z.string(),
+});
+const uploadChunkBytes = 256 * 1024;
 const closeResultSchema = z.object({ archived: z.literal(true) });
+const pageDiagnosticsSchema = z.object({
+    sessionCount: z.number().int().nonnegative(),
+    operationCount: z.number().int().nonnegative(),
+    uploadCount: z.number().int().nonnegative(),
+    bufferedUploadBytes: z.number().int().nonnegative(),
+});
 export class GptConnector {
     #client;
     #sessions = new SessionRegistry();
+    #jobs;
     #operationTimeoutMs;
     #pollIntervalMs;
     constructor(client, options) {
         this.#client = client;
+        this.#jobs = new ConsultJobStore({ stateDirectory: options.stateDirectory });
         this.#operationTimeoutMs = options.operationTimeoutMs ?? 180_000;
         this.#pollIntervalMs = options.pollIntervalMs ?? 250;
     }
@@ -55,28 +87,214 @@ export class GptConnector {
         const connector = new GptConnector(client, options);
         try {
             await client.call("Runtime.enable");
+            await connector.#jobs.initialize();
             await connector.#bootstrap();
             return connector;
         }
         catch (error) {
-            client.close();
+            try {
+                connector.#jobs.close();
+            }
+            finally {
+                client.close();
+            }
             throw error;
         }
     }
+    static async doctor(options = {}) {
+        let connector = null;
+        try {
+            connector = await GptConnector.connect(options);
+            return await connector.diagnostics();
+        }
+        catch (error) {
+            const code = error instanceof ConnectorError ? error.code : null;
+            return {
+                schema: "gpt-connector.diagnostics.v1",
+                packageVersion,
+                overall: "not_ready",
+                reasonCode: diagnosticReason(code),
+                cdpConnected: false,
+                officialOrigin: null,
+                authenticated: code === "AUTH_REQUIRED" ? false : null,
+                bridgeBuildId,
+                sessionCount: null,
+                operationCount: null,
+                uploadCount: null,
+                bufferedUploadBytes: null,
+                jobCount: null,
+                activeJobCount: null,
+                terminalJobCount: null,
+            };
+        }
+        finally {
+            connector?.close();
+        }
+    }
     async models() {
         const result = await this.#runOperation("startModels", []);
         return modelCatalogSchema.parse(result);
     }
+    async diagnostics() {
+        const page = pageDiagnosticsSchema.parse(await evaluateByValue(this.#client, createBridgeCallExpression("diagnostics", []), false));
+        const jobs = this.#jobs.diagnostics();
+        return {
+            schema: "gpt-connector.diagnostics.v1",
+            packageVersion,
+            overall: "ready",
+            reasonCode: "ready",
+            cdpConnected: true,
+            officialOrigin: true,
+            authenticated: true,
+            bridgeBuildId,
+            ...page,
+            ...jobs,
+        };
+    }
     async chat(input) {
         const parsed = chatInputSchema.parse(input);
+        const result = await this.#chatParsed(parsed, []);
+        return chatResultSchema.parse(result);
+    }
+    async consult(input) {
+        let parsed;
+        try {
+            parsed = consultInputSchema.parse(input);
+        }
+        catch {
+            throw new ConnectorError("INVALID_INPUT", "consult inputが公開schemaに一致しません。");
+        }
         const catalog = await this.models();
         validateModelSelection(catalog, parsed.model, parsed.effort);
+        const prepared = parsed.files === undefined
+            ? { files: [], totalBytes: 0 }
+            : await prepareAttachmentFiles({
+                workspaceRoot: parsed.workspaceRoot,
+                specs: parsed.files,
+            });
+        const fileMetadata = prepared.files.map((file) => ({
+            relativePath: file.relativePath,
+            name: file.name,
+            bytes: file.bytes,
+            mimeType: file.mimeType,
+            sha256: file.sha256,
+        }));
+        if (parsed.dryRun) {
+            for (const file of prepared.files)
+                file.content.fill(0);
+            return {
+                dryRun: true,
+                slug: parsed.slug,
+                files: fileMetadata,
+                totalBytes: prepared.totalBytes,
+                requestedModel: parsed.model ?? null,
+                requestedEffort: parsed.effort ?? null,
+                limits: attachmentLimits,
+                uploadWouldRun: false,
+                conversationWouldRun: false,
+            };
+        }
+        const fingerprint = consultFingerprint({
+            prompt: parsed.prompt,
+            files: fileMetadata,
+            model: parsed.model ?? null,
+            effort: parsed.effort ?? null,
+            keepOpen: parsed.keepOpen,
+        });
+        const reservation = await this.#jobs.reserve(parsed.slug, fingerprint);
+        if (!reservation.created) {
+            for (const file of prepared.files)
+                file.content.fill(0);
+            return reservation.snapshot;
+        }
+        return this.#runConsultJob(parsed, prepared.files);
+    }
+    sessions(input) {
+        let parsed;
+        try {
+            parsed = sessionsInputSchema.parse(input);
+        }
+        catch {
+            throw new ConnectorError("INVALID_INPUT", "sessions inputが公開schemaに一致しません。");
+        }
+        return this.#jobs.get(parsed.slug);
+    }
+    async #runConsultJob(parsed, files) {
+        let uploadHandles = [];
+        try {
+            await this.#jobs.transition(parsed.slug, "uploading");
+            uploadHandles = await this.#uploadAttachments(files);
+            await this.#jobs.transition(parsed.slug, "submitted");
+            await this.#jobs.transition(parsed.slug, "running");
+            const result = await this.#chatParsed({
+                prompt: parsed.prompt,
+                model: parsed.model,
+                effort: parsed.effort,
+                keepOpen: parsed.keepOpen,
+            }, uploadHandles, true);
+            return this.#jobs.transition(parsed.slug, "succeeded", {
+                result: {
+                    text: result.text,
+                    status: result.status,
+                    endTurn: true,
+                    resolvedModel: result.resolvedModel,
+                    resolvedEffort: result.resolvedEffort,
+                    ...(result.sessionId === undefined ? {} : { sessionId: result.sessionId }),
+                    attachments: result.attachments,
+                    archived: parsed.keepOpen !== true,
+                },
+                error: null,
+            });
+        }
+        catch (error) {
+            let jobError = error;
+            let cleanup = "not_supported";
+            for (const uploadHandle of uploadHandles) {
+                try {
+                    await this.#discardUpload(uploadHandle);
+                }
+                catch {
+                    // job errorをcleanup failureへ昇格し、成功や元errorの握り潰しを防ぐ。
+                    jobError = new ConnectorError("UPLOAD_FAILED", "consult失敗後にpage側upload handleを完全破棄できませんでした。");
+                    cleanup = "failed";
+                    break;
+                }
+            }
+            const connectorError = jobError instanceof ConnectorError
+                ? jobError
+                : new ConnectorError("CHAT_FAILED", "consult jobが失敗しました。");
+            const partialCount = typeof connectorError.details?.uploadedCount === "number"
+                ? connectorError.details.uploadedCount
+                : uploadHandles.length;
+            const partialCleanup = connectorError.details?.cleanup === "failed"
+                ? "failed"
+                : cleanup;
+            return this.#jobs.transition(parsed.slug, "failed", {
+                result: null,
+                error: {
+                    code: connectorError.code,
+                    message: connectorError.message,
+                    retry: retryFor(connectorError.code),
+                    ...(partialCount > 0 ? {
+                        partialUpload: { count: partialCount, cleanup: partialCleanup },
+                    } : {}),
+                },
+            });
+        }
+    }
+    async #chatParsed(parsed, attachmentHandles, selectionValidated = false) {
+        if (!selectionValidated) {
+            const catalog = await this.models();
+            validateModelSelection(catalog, parsed.model, parsed.effort);
+        }
         const existingSession = parsed.sessionId;
         if (existingSession !== undefined)
             this.#sessions.acquire(existingSession);
         try {
-            const raw = await this.#runOperation("startChat", [parsed]);
-            const result = chatResultSchema.parse(raw);
+            const raw = await this.#runOperation("startChat", [
+                { ...parsed, attachmentHandles },
+            ]);
+            const result = bridgeChatResultSchema.parse(raw);
             if (existingSession !== undefined) {
                 if (parsed.keepOpen)
                     this.#sessions.release(existingSession);
@@ -101,6 +319,87 @@ export class GptConnector {
             throw error;
         }
     }
+    async #uploadAttachments(files) {
+        const uploadHandles = [];
+        try {
+            for (const file of files) {
+                uploadHandles.push(await this.#transferAttachment(file));
+            }
+            return uploadHandles;
+        }
+        catch (error) {
+            const cleanupFailures = [];
+            for (const uploadHandle of uploadHandles) {
+                try {
+                    await this.#discardUpload(uploadHandle);
+                }
+                catch (cleanupError) {
+                    cleanupFailures.push(cleanupError instanceof ConnectorError ? cleanupError.code : "RUNTIME_DRIFT");
+                }
+            }
+            if (cleanupFailures.length > 0) {
+                throw new ConnectorError("UPLOAD_FAILED", "添付upload失敗後にpage側handleを完全破棄できませんでした。", {
+                    cleanupFailureCount: cleanupFailures.length,
+                    uploadedCount: uploadHandles.length,
+                    cleanup: "failed",
+                    originalCode: error instanceof ConnectorError ? error.code : "UPLOAD_FAILED",
+                });
+            }
+            if (uploadHandles.length > 0) {
+                const original = error instanceof ConnectorError
+                    ? error
+                    : new ConnectorError("UPLOAD_FAILED", "添付uploadが途中で失敗しました。");
+                throw new ConnectorError(original.code, original.message, {
+                    uploadedCount: uploadHandles.length,
+                    cleanup: "not_supported",
+                });
+            }
+            throw error;
+        }
+        finally {
+            for (const file of files)
+                file.content.fill(0);
+        }
+    }
+    async #transferAttachment(file) {
+        const created = uploadHandleSchema.parse(await evaluateByValue(this.#client, createBridgeCallExpression("createUpload", [{
+                name: file.name,
+                mimeType: file.mimeType,
+                size: file.bytes,
+                sha256: file.sha256,
+            }]), false));
+        try {
+            for (let offset = 0; offset < file.content.byteLength; offset += uploadChunkBytes) {
+                const length = Math.min(uploadChunkBytes, file.content.byteLength - offset);
+                const base64Chunk = Buffer.from(file.content.buffer, file.content.byteOffset + offset, length).toString("base64");
+                const appended = uploadChunkResultSchema.parse(await evaluateByValue(this.#client, createBridgeCallExpression("appendUploadChunk", [
+                    created.uploadHandle,
+                    base64Chunk,
+                ]), false));
+                if (appended.receivedBytes !== offset + length) {
+                    throw new ConnectorError("UPLOAD_FAILED", "page側の添付byte受信数が一致しませんでした。");
+                }
+            }
+            const result = uploadResultSchema.parse(await this.#runOperation("startUpload", [{
+                    uploadHandle: created.uploadHandle,
+                    timeoutMs: Math.min(this.#operationTimeoutMs, 120_000),
+                }]));
+            if (result.uploadHandle !== created.uploadHandle ||
+                result.name !== file.name ||
+                result.size !== file.bytes ||
+                result.mimeType !== file.mimeType) {
+                throw new ConnectorError("RUNTIME_DRIFT", "upload完了metadataが送信fileと一致しませんでした。");
+            }
+            return created.uploadHandle;
+        }
+        catch (error) {
+            await this.#discardUpload(created.uploadHandle);
+            throw error;
+        }
+    }
+    async #discardUpload(uploadHandle) {
+        await evaluateByValue(this.#client, createBridgeCallExpression("discardUpload", [uploadHandle]), false);
+    }
     async closeSession(input) {
         const parsed = closeInputSchema.parse(input);
         this.#sessions.acquire(parsed.sessionId);
@@ -117,7 +416,12 @@ export class GptConnector {
         }
     }
     close() {
-        this.#client.close();
+        try {
+            this.#jobs.close();
+        }
+        finally {
+            this.#client.close();
+        }
     }
     async shutdown() {
         const failures = [];
@@ -129,7 +433,12 @@ export class GptConnector {
                 failures.push(error instanceof ConnectorError ? error.code : "CHAT_FAILED");
             }
         }
-        this.#client.close();
+        try {
+            this.#jobs.close();
+        }
+        finally {
+            this.#client.close();
+        }
         if (failures.length > 0) {
             throw new ConnectorError("ARCHIVE_FAILED", "shutdown時に一部sessionをarchiveできませんでした。", { failureCount: failures.length });
         }
@@ -175,7 +484,7 @@ export class GptConnector {
             return;
         const urls = await listLoadedAssetUrls(this.#client);
         const assets = await discoverRuntimeAssets(urls);
-        const summary = await evaluateByValue(this.#client, createBridgeBootstrapExpression(assets.coreUrl, assets.conversationUrl));
+        const summary = await evaluateByValue(this.#client, createBridgeBootstrapExpression(assets.coreUrl, assets.conversationUrl, assets.uploadUrl));
         const parsed = z
             .object({
             version: z.literal(1),
@@ -187,6 +496,7 @@ export class GptConnector {
             throw new ConnectorError("RUNTIME_DRIFT", "page bridgeを初期化できませんでした。", {
                 coreFingerprint: assets.coreFingerprint,
                 conversationFingerprint: assets.conversationFingerprint,
+                uploadFingerprint: assets.uploadFingerprint,
             });
         }
     }
@@ -206,9 +516,7 @@ export class GptConnector {
             }
             await delay(this.#pollIntervalMs);
         }
-        throw new ConnectorError("CHAT_FAILED", "ChatGPT runtime operationがtimeoutしました。", {
-            method,
-        });
+        throw new ConnectorError(method === "startUpload" ? "UPLOAD_TIMEOUT" : "CHAT_FAILED", "ChatGPT runtime operationがtimeoutしました。", { method });
     }
     async #consumeOperation(operationId) {
         await evaluateByValue(this.#client, createBridgeCallExpression("poll", [operationId, true]), false);
@@ -219,4 +527,54 @@ function toConnectorErrorCode(value) {
         ? value
         : "CHAT_FAILED";
 }
+function diagnosticReason(code) {
+    if (code === "AUTH_REQUIRED")
+        return "auth_required";
+    if (code === "CDP_UNAVAILABLE")
+        return "cdp_unavailable";
+    if (code === "RUNTIME_DRIFT")
+        return "runtime_drift";
+    if (code === "JOB_RECOVERY_UNAVAILABLE")
+        return "state_unavailable";
+    return "connector_error";
+}
+function consultFingerprint(input) {
+    return createHash("sha256")
+        .update(JSON.stringify({
+        promptSha256: createHash("sha256").update(input.prompt).digest("hex"),
+        files: input.files.map((file) => ({
+            relativePath: file.relativePath,
+            bytes: file.bytes,
+            sha256: file.sha256,
+        })),
+        model: input.model,
+        effort: input.effort,
+        keepOpen: input.keepOpen,
+    }))
+        .digest("hex");
+}
+function retryFor(code) {
+    if (code === "AUTH_REQUIRED")
+        return "after_auth";
+    if (code === "RUNTIME_DRIFT")
+        return "after_runtime_update";
+    if (code === "INVALID_INPUT" ||
+        code === "FILE_NOT_FOUND" ||
+        code === "FILE_OUTSIDE_ROOT" ||
+        code === "SENSITIVE_FILE_BLOCKED" ||
+        code === "FILE_TYPE_NOT_SUPPORTED" ||
+        code === "FILE_EMPTY" ||
+        code === "FILE_LIMIT_EXCEEDED" ||
+        code === "MODEL_NOT_AVAILABLE" ||
+        code === "EFFORT_NOT_SUPPORTED")
+        return "after_input_change";
+    if (code === "UPLOAD_TIMEOUT" ||
+        code === "UPLOAD_FAILED" ||
+        code === "CHAT_FAILED" ||
+        code === "STREAM_INCOMPLETE" ||
+        code === "ATTACHMENT_READBACK_FAILED" ||
+        code === "JOB_RECOVERY_UNAVAILABLE")
+        return "status_first";
+    return "never";
+}
 //# sourceMappingURL=connector.js.map