glimmervoid 0.39.0 → 0.40.0

package/dist/chunks/{pair-cli-D9DZBqk0.js → pair-cli-CsOVTQGJ.js}

@@ -1,6 +1,6 @@
 import { r as errorMessage } from "./text-DoirglWV.js";
-import { c as resolveConfigPath } from "./config-store-n23JDU4E.js";
-import { c as defaultPairingsPath, i as REVOCATION_PROPAGATION_SECONDS, l as defaultSeenPath, n as normalizeRemoteConfig, o as createPairingsStore, s as createSeenStore } from "./remote-config-DiLwnzBq.js";
+import { c as resolveConfigPath } from "./config-store-DqMScSdg.js";
+import { c as defaultPairingsPath, i as REVOCATION_PROPAGATION_SECONDS, l as defaultSeenPath, n as normalizeRemoteConfig, o as createPairingsStore, s as createSeenStore } from "./remote-config-HlABuLTp.js";
 import fs from "node:fs";
 //#region server/text-format.ts
 function trimIso(iso) {

package/dist/chunks/{remote-config-DiLwnzBq.js → remote-config-HlABuLTp.js}

@@ -3,7 +3,7 @@ import { n as equalsIgnoringCaseOnWindows } from "./paths-Bu4eH1Yd.js";
 import { n as isRecord } from "./coerce-NSst8oRP.js";
 import { n as unrefTimer, t as DEFAULT_TIMER_FNS } from "./timer-deps-u2DAQLok.js";
 import { a as jsonStateLoadError, d as writeJsonAtomicSync, l as sleepSync, s as loadJsonStateFileSync, u as writeJsonAtomic } from "./json-file-DFCTvPjj.js";
-import { o as glimmervoidHomeDir, ot as canonicalizePath } from "./config-store-n23JDU4E.js";
+import { o as glimmervoidHomeDir, ot as canonicalizePath } from "./config-store-DqMScSdg.js";
 import fs from "node:fs";
 import path from "node:path";
 import crypto from "node:crypto";

package/dist/chunks/{session-D2EbiysG.js → session-BwB43SCa.js}

@@ -13,26 +13,15 @@ var STATES = Object.freeze({
 });
 Object.freeze({
 	[STATES.DORMANT]: "Dormant",
-	[STATES.INITIALIZING]: "Preparing",
+	[STATES.INITIALIZING]: "Starting",
 	[STATES.STARTING]: "Starting",
 	[STATES.RUNNING]: "Working",
 	[STATES.WAITING]: "Needs Input",
 	[STATES.IDLE]: "Idle",
-	[STATES.COMPLETE]: "Complete",
+	[STATES.COMPLETE]: "Idle",
 	[STATES.DONE]: "Exited",
 	[STATES.FAILED]: "Failed"
 });
-Object.freeze({
-	[STATES.DORMANT]: "○",
-	[STATES.INITIALIZING]: "◴",
-	[STATES.STARTING]: "◐",
-	[STATES.RUNNING]: "●",
-	[STATES.WAITING]: "◆",
-	[STATES.IDLE]: "◎",
-	[STATES.FAILED]: "▲",
-	[STATES.DONE]: "■",
-	[STATES.COMPLETE]: "◇"
-});
 var KILLABLE_STATES = Object.freeze([
 	STATES.INITIALIZING,
 	STATES.STARTING,
@@ -60,6 +49,10 @@ var githubPollingShape = {
 	isRefreshing: z.boolean().optional(),
 	refreshNotice: z.string().nullable().optional()
 };
+var GithubPrsFreshness = z.strictObject({
+	lastRefreshedAt: z.number().finite().nonnegative().nullable(),
+	error: z.string().nullable()
+});
 var GithubPollingRefreshRequest = z.object({ lane: z.enum([
 	"my-prs",
 	"team-review",
@@ -67,7 +60,8 @@ var GithubPollingRefreshRequest = z.object({ lane: z.enum([
 ]) });
 var GithubPollingRefreshResult = z.object({
 	ok: z.boolean(),
-	error: z.string().optional()
+	error: z.string().optional(),
+	freshness: GithubPrsFreshness.optional()
 });
 //#endregion
 //#region shared/contracts/github-ids.ts
@@ -92,20 +86,6 @@ function shortSha(sha, { chars = 7, validate = false } = {}) {
 //#region shared/contracts/team-review.ts
 var CommitSha = z.string().regex(FULL_SHA_RE);
 var repoSlug = z.string().regex(/^[^/]+\/[^/]+$/);
-var SearchedPr = z.object({
-	number: z.number().int().positive(),
-	title: z.string(),
-	html_url: z.string(),
-	draft: z.boolean().optional(),
-	created_at: z.string().optional(),
-	updated_at: z.string().optional(),
-	repository_url: z.string(),
-	user: z.object({
-		login: z.string(),
-		type: z.enum(["User", "Bot"])
-	}).passthrough(),
-	pull_request: z.object({}).passthrough()
-}).passthrough();
 var PrDetail = z.object({
 	number: z.number().int().positive(),
 	title: z.string(),
@@ -115,6 +95,11 @@ var PrDetail = z.object({
 		login: z.string(),
 		is_bot: z.boolean().optional()
 	}).passthrough(),
+	state: z.enum([
+		"OPEN",
+		"CLOSED",
+		"MERGED"
+	]).optional(),
 	isDraft: z.boolean(),
 	isCrossRepository: z.boolean(),
 	baseRefName: z.string(),
@@ -241,6 +226,12 @@ var PriorReview = z.object({
 	comments: z.array(ReviewComment),
 	wasPosted: z.boolean()
 });
+var EarlierReview = PriorReview.pick({
+	head: true,
+	verdict: true,
+	summary: true,
+	wasPosted: true
+}).extend({ comments: z.array(DraftComment) });
 var ReviewThreadId = z.string().min(1).max(256).regex(NODE_ID_RE);
 var TeamReviewThreadResult = z.object({
 	addressed: z.boolean(),
@@ -361,7 +352,8 @@ var ReviewDraft = z.object({
 	postedAt: z.number().finite().optional(),
 	postedEvent: PostedReviewEvent.optional(),
 	priorReviewedHead: CommitSha.optional(),
-	requeuedHead: CommitSha.optional()
+	requeuedHead: CommitSha.optional(),
+	earlierReview: EarlierReview.optional()
 });
 function canApproveAfterComment(draft) {
 	return draft.status === "posted" && draft.postedEvent === "COMMENT";
@@ -435,6 +427,7 @@ var TeamReviewStateEntry = z.object({
 	requeuedHead: CommitSha.optional(),
 	priorReview: PriorReview.optional(),
 	discardedReviewHead: CommitSha.optional(),
+	requestedAt: z.number().finite().optional(),
 	updatedAt: z.number().finite()
 });
 z.record(z.string(), TeamReviewStateEntry);
@@ -673,6 +666,16 @@ var MyPr = z.object({
 	isMergeQueueHeldForRepairPush: z.boolean().optional(),
 	mergeQueueFailure: MyPrMergeQueueFailure.optional()
 }).refine((pr) => pr.key === `${pr.repo}#${pr.number}`);
+var MyPrLaneEntry = z.strictObject({
+	key: pullRequestKey,
+	autoRebase: MyPr.shape.autoRebase,
+	keepMergeable: MyPr.shape.keepMergeable,
+	keepMergeableAttempt: MyPr.shape.keepMergeableAttempt,
+	isKeepMergeableFixInFlight: MyPr.shape.isKeepMergeableFixInFlight,
+	mergeQueuePosition: MyPr.shape.mergeQueuePosition,
+	isMergeQueueHeldForRepairPush: MyPr.shape.isMergeQueueHeldForRepairPush,
+	mergeQueueFailure: MyPr.shape.mergeQueueFailure
+});
 var MyPrsStatus = z.object({
 	...githubPollingShape,
 	type: z.literal("my-prs-status"),
@@ -680,11 +683,12 @@ var MyPrsStatus = z.object({
 	configured: z.boolean(),
 	reason: z.string().nullable().optional(),
 	viewer: z.string().nullable(),
-	prs: z.array(MyPr),
+	prs: z.array(MyPrLaneEntry),
 	truncatedNote: z.string().nullable().optional(),
 	isKeepMergeableEnabled: z.boolean().optional(),
 	isMergeQueueEnabled: z.boolean().optional()
 }).passthrough();
+var MyPrsSnapshot = MyPrsStatus.extend({ prs: z.array(MyPr) });
 var MyPrMergeRequest = z.object({
 	repo: repositoryName,
 	number: z.number().int().positive(),
@@ -842,7 +846,7 @@ var MyPrMergeStateResponse = z.object({
 	}).nullable() }).nullable() }),
 	errors: z.array(z.unknown()).optional()
 });
-var MyPrSearchResponse = z.object({
+z.object({
 	data: z.object({
 		open: z.object({
 			issueCount: nonnegativeInteger,
@@ -859,7 +863,10 @@ var SESSION_NAME_PATTERN = /^[a-zA-Z0-9_\-. ()]{1,64}$/;
 var SESSION_NAME_RULE_TEXT = "Session name may only contain letters, numbers, spaces, dashes, dots, underscores, and parentheses (max 64 chars)";
 var TASK_TITLE_CONTROL_CHARACTERS = /[\x00-\x1f\x7f-\x9f]/;
 var TaskTitle = z.string().refine((title) => !TASK_TITLE_CONTROL_CHARACTERS.test(title)).trim().max(120);
-var RefinedTaskTitle = z.object({ title: z.string().nullable() }).strict();
+var RefinedTaskTitle = z.object({
+	title: z.string().nullable(),
+	name: z.string().nullable().optional()
+}).strict();
 var SessionState = z.enum(STATES);
 var PendingWakeup = z.object({
 	at: z.number().finite().nullable(),
@@ -964,14 +971,19 @@ var SshSignReply = z.union([z.object({
 	ok: z.literal(false),
 	error: z.string()
 }).strict()]);
-var AGENT_API_VERBS = [
+var SESSION_COMMANDS = [
+	"push",
 	"spawn",
 	"attention",
 	"board",
-	"push",
 	"edit",
-	"limits"
+	"review",
+	"reviews",
+	"prs",
+	"link-pr",
+	"settings"
 ];
+var AGENT_API_VERBS = [...SESSION_COMMANDS, "limits"];
 var AgentSpawnRequest = z.object({
 	prompt: z.string({ error: "prompt must be a string" }).min(1, { error: "prompt must not be empty" }).max(2e4, { error: "prompt must be at most 20000 characters" }).refine((prompt) => !prompt.trimStart().startsWith("-"), { message: "prompt must not start with a dash, which the agent CLI would read as an option" }),
 	name: z.string({ error: "name must be a string" }).min(1, { error: "name must not be empty" }).max(200, { error: "name must be at most 200 characters" }).optional(),
@@ -992,6 +1004,61 @@ z.object({
 	state: SessionSnapshot.shape.state,
 	ephemeral: SessionSnapshot.shape.ephemeral
 }).strict();
+var AgentPullRequestRequest = z.object({ pr: z.string({ error: "pr must be a string" }).min(1, { error: "pr must not be empty" }).max(300, { error: "pr must be at most 300 characters" }) }).strict();
+var AgentSettingsRequest = z.object({
+	command: z.enum(["list", "get"], { error: "command must be list or get" }),
+	path: z.string({ error: "path must be a string" }).min(1, { error: "path must not be empty" }).max(200, { error: "path must be at most 200 characters" }).optional()
+}).strict();
+var AgentSettingsReply = z.union([z.object({
+	ok: z.literal(true),
+	text: z.string(),
+	readout: z.unknown()
+}).strict(), z.object({
+	ok: z.literal(false),
+	error: z.string()
+}).strict()]);
+var PullRequestIdentity = QueuedReview.pick({
+	key: true,
+	title: true,
+	url: true,
+	author: true
+});
+z.object({
+	ok: z.literal(true),
+	configured: z.boolean(),
+	reason: z.string().nullable(),
+	reviewing: z.array(PullRequestIdentity.extend({ phase: InFlightReview.shape.phase })),
+	queued: z.array(PullRequestIdentity),
+	drafts: z.array(PullRequestIdentity.extend({
+		status: ReviewDraft.shape.status,
+		verdict: z.string(),
+		summary: ReviewDraft.shape.summary,
+		comments: z.number().int().nonnegative(),
+		isOutOfDate: z.boolean()
+	}))
+}).strict();
+z.object({
+	ok: z.literal(true),
+	configured: z.boolean(),
+	prs: z.array(z.object({
+		key: MyPr.shape.key,
+		title: MyPr.shape.title,
+		url: MyPr.shape.url,
+		state: MyPr.shape.state,
+		isDraft: MyPr.shape.isDraft,
+		stage: MyPr.shape.stage,
+		reviewDecision: MyPr.shape.reviewDecision,
+		approvals: MyPr.shape.approvals,
+		unresolvedThreads: MyPr.shape.unresolvedThreads,
+		behindBy: MyPr.shape.behindBy,
+		mergeable: MyPr.shape.mergeable,
+		isInMergeQueue: MyPr.shape.isInMergeQueue,
+		checks: MyPr.shape.checks.pick({
+			state: true,
+			failing: true
+		})
+	}).strict())
+}).strict();
 var SESSION_DOC_BODY_CAP_BYTES = 262144;
 var SESSION_DOC_PATH_MAX_CHARS = 4096;
 var AgentEditRequest = z.object({ path: z.string({ error: "path must be a string" }).min(1, { error: "path must not be empty" }).max(SESSION_DOC_PATH_MAX_CHARS, { error: `path must be at most ${SESSION_DOC_PATH_MAX_CHARS} characters` }) }).strict();
@@ -1000,13 +1067,6 @@ var SessionDoc = z.object({
 	name: z.string(),
 	surfacedAt: z.number().finite()
 }).strict();
-var SESSION_COMMANDS = [
-	"push",
-	"spawn",
-	"attention",
-	"board",
-	"edit"
-];
 var AgentLimitsReply = z.object({
 	commands: z.array(z.object({
 		name: z.enum(SESSION_COMMANDS),
@@ -1020,4 +1080,4 @@ var AgentLimitsReply = z.object({
 	}).strict())
 }).strict().extend({ ok: z.literal(true) }).strict();
 //#endregion
-export { CommitSha as $, SshSignRequest as A, shortSha as At, MyPrMergeRequest as B, RESTARTABLE_STATES as Bt, SESSION_NAME_RULE_TEXT as C, TeamReviewThreadsRepository as Ct, SessionSnapshot as D, hasStandingViewerApproval as Dt, SessionDoc as E, hasRequiredActionHead as Et, MyPrCheckContext as F, GithubPollingRefreshRequest as Ft, MyPrSearchNode as G, MyPrMergeStateResponse as H, MyPrCheckContextsResponse as I, GithubPollingRefreshResult as It, MyPrThreadsResponse as J, MyPrSearchResponse as K, MyPrKeepMergeableRequest as L, githubPollingShape as Lt, TaskTitle as M, NODE_ID_RE as Mt, LinkedPr as N, REPO_SLUG_RE as Nt, SessionState as O, FULL_SHA_RE as Ot, MyPrAutoRebase as P, repoParts as Pt, repositoryName as Q, MyPrKeepMergeableResult as R, KILLABLE_STATES as Rt, SESSION_NAME_PATTERN as S, TeamReviewThreadResult as St, SSH_SIGN_BODY_CAP_BYTES as T, decisionAsIfApprovalRequired as Tt, MyPrMergeWhenReadyRequest as U, MyPrMergeResult as V, STATES as Vt, MyPrMergeWhenReadyResult as W, MyPrsStatus as X, MyPrsState as Y, SessionPrLinks as Z, PendingWakeup as _, TeamReviewCompareFiles as _t, AgentEditRequest as a, PrDetail as at, SESSION_DOC_BODY_CAP_BYTES as b, TeamReviewStatus as bt, COHERENCE_HOOKS_INACTIVE as c, ReviewComment as ct, CONVERSATION_TOOL_RESULT_HOOK_EVENT as d, ReviewResult as dt, DECIDING_REVIEW_STATES as et, CoherenceHooksState as f, ReviewThreadId as ft, ConversationQuestion as g, TeamReviewActionResult as gt, ConversationApprovalDecision as h, TeamReviewActionRequest as ht, AgentAttentionRequest as i, PostingPlan as it, TASK_TITLE_CONTROL_CHARACTERS as j, GH_SEGMENT as jt, SshSignReply as k, HEX_SHA_RE as kt, CONVERSATION_APPROVAL_SUMMARY_MAX_CHARS as l, ReviewDraft as lt, ConversationApproval as m, SearchedPr as mt, AGENT_URL_ENV as n, GithubReviewDecision as nt, AgentLimitsReply as o, QueuedReview as ot, ConversationAnswers as p, ReviewVerdict as pt, MyPrThreadNode as q, ASK_USER_QUESTION_TOOL_NAME as r, GithubReviewState as rt, AgentSpawnRequest as s, ReviewChecksState as st, AGENT_API_VERBS as t, FindingSeverity as tt, CONVERSATION_PERMISSION_HOOK_EVENT as u, ReviewFinding as ut, RefinedTaskTitle as v, TeamReviewResolveResponse as vt, SIGN_URL_ENV as w, canApproveAfterComment as wt, SESSION_DOC_PATH_MAX_CHARS as x, TeamReviewThreadCommentsResponse as xt, SESSION_COMMANDS as y, TeamReviewStateEntry as yt, MyPrMergeMethod as z, MERGEABLE_LIVE_STATES as zt };
+export { MyPrsSnapshot as $, SessionSnapshot as A, canApproveAfterComment as At, MyPrCheckContextsResponse as B, repoParts as Bt, SESSION_DOC_BODY_CAP_BYTES as C, TeamReviewCompareFiles as Ct, SIGN_URL_ENV as D, TeamReviewThreadCommentsResponse as Dt, SESSION_NAME_RULE_TEXT as E, TeamReviewStatus as Et, TaskTitle as F, HEX_SHA_RE as Ft, MyPrMergeRequest as G, KILLABLE_STATES as Gt, MyPrKeepMergeableResult as H, GithubPollingRefreshResult as Ht, LinkedPr as I, shortSha as It, MyPrMergeWhenReadyRequest as J, STATES as Jt, MyPrMergeResult as K, MERGEABLE_LIVE_STATES as Kt, MyPr as L, GH_SEGMENT as Lt, SshSignReply as M, hasRequiredActionHead as Mt, SshSignRequest as N, hasStandingViewerApproval as Nt, SSH_SIGN_BODY_CAP_BYTES as O, TeamReviewThreadResult as Ot, TASK_TITLE_CONTROL_CHARACTERS as P, FULL_SHA_RE as Pt, MyPrThreadsResponse as Q, MyPrAutoRebase as R, NODE_ID_RE as Rt, SESSION_COMMANDS as S, TeamReviewActionResult as St, SESSION_NAME_PATTERN as T, TeamReviewStateEntry as Tt, MyPrLaneEntry as U, GithubPrsFreshness as Ut, MyPrKeepMergeableRequest as V, GithubPollingRefreshRequest as Vt, MyPrMergeMethod as W, githubPollingShape as Wt, MyPrSearchNode as X, MyPrMergeWhenReadyResult as Y, MyPrThreadNode as Z, ConversationApproval as _, ReviewFinding as _t, AgentEditRequest as a, CommitSha as at, PendingWakeup as b, ReviewVerdict as bt, AgentSettingsReply as c, FindingSeverity as ct, COHERENCE_HOOKS_INACTIVE as d, PostingPlan as dt, MyPrsState as et, CONVERSATION_APPROVAL_SUMMARY_MAX_CHARS as f, PrDetail as ft, ConversationAnswers as g, ReviewDraft as gt, CoherenceHooksState as h, ReviewComment as ht, AgentAttentionRequest as i, repositoryName as it, SessionState as j, decisionAsIfApprovalRequired as jt, SessionDoc as k, TeamReviewThreadsRepository as kt, AgentSettingsRequest as l, GithubReviewDecision as lt, CONVERSATION_TOOL_RESULT_HOOK_EVENT as m, ReviewChecksState as mt, AGENT_URL_ENV as n, SessionPrLinks as nt, AgentLimitsReply as o, DECIDING_REVIEW_STATES as ot, CONVERSATION_PERMISSION_HOOK_EVENT as p, QueuedReview as pt, MyPrMergeStateResponse as q, RESTARTABLE_STATES as qt, ASK_USER_QUESTION_TOOL_NAME as r, pullRequestKeyFormat as rt, AgentPullRequestRequest as s, EarlierReview as st, AGENT_API_VERBS as t, MyPrsStatus as tt, AgentSpawnRequest as u, GithubReviewState as ut, ConversationApprovalDecision as v, ReviewResult as vt, SESSION_DOC_PATH_MAX_CHARS as w, TeamReviewResolveResponse as wt, RefinedTaskTitle as x, TeamReviewActionRequest as xt, ConversationQuestion as y, ReviewThreadId as yt, MyPrCheckContext as z, REPO_SLUG_RE as zt };

package/dist/chunks/{session-routes-BQAZzMKZ.js → session-routes-DNJzsckH.js}

@@ -1,4 +1,4 @@
-import { y as SESSION_COMMANDS } from "./session-D2EbiysG.js";
+import { S as SESSION_COMMANDS } from "./session-BwB43SCa.js";
 //#region session/core/session-routes.ts
 var SUPERVISION_LINE = "Glimmervoid supervises this session. Run glimmervoid --help for the commands it gives you and this session's limits.";
 var GUARDRAILS_LINE = "Its guardrails are OS-enforced, so a read, write or connection they refuse will not succeed on retry.";
@@ -70,12 +70,32 @@ function editRoute(caller) {
 		reason: "a lane session cannot surface a file, because it has no card for the operator to open the file from"
 	};
 }
+function operatorStateRoute(caller) {
+	if (hasOperatorCard(caller)) return ANSWERS;
+	return {
+		answers: false,
+		reason: "a lane session cannot read or queue the operator's reviews, pull requests or settings, because a lane runs on input the operator has not vetted"
+	};
+}
+function linkPrRoute(caller) {
+	if (hasOperatorCard(caller)) return ANSWERS;
+	return {
+		answers: false,
+		reason: "a lane session cannot link a pull request, because it has no card to show the link on"
+	};
+}
 var COMMAND_ROUTES = Object.freeze({
 	push: pushRoute,
 	spawn: spawnRoute,
 	attention: attentionRoute,
 	board: () => ANSWERS,
-	edit: editRoute
+	edit: editRoute,
+	review: operatorStateRoute,
+	reviews: operatorStateRoute,
+	prs: operatorStateRoute,
+	"link-pr": linkPrRoute,
+	settings: operatorStateRoute,
+	limits: () => ANSWERS
 });
 function commandLimit(name, facts) {
 	const verdict = COMMAND_ROUTES[name](facts);
@@ -119,4 +139,4 @@ function formatSessionLimits({ commands, guarded, deadEnds }) {
 	];
 }
 //#endregion
-export { formatSessionLimits as a, spawnRoute as c, editRoute as i, supervisionLine as l, attentionRoute as n, permitsHelpCommand as o, describeSessionLimits as r, pushRoute as s, NO_OWN_WORKTREE_REASON as t };
+export { permitsHelpCommand as a, formatSessionLimits as i, NO_OWN_WORKTREE_REASON as n, supervisionLine as o, describeSessionLimits as r, COMMAND_ROUTES as t };

package/dist/chunks/{settings-cli-DP4t-I9U.js → settings-cli-DkkbK-dj.js}

@@ -1,10 +1,11 @@
 import { r as errorMessage, t as errorCode } from "./text-DoirglWV.js";
-import "./session-D2EbiysG.js";
+import { c as AgentSettingsReply } from "./session-BwB43SCa.js";
 import { t as renderTable } from "./ascii-figure-core-pDAwtlKO.js";
 import { n as glimmervoidHomeDir, t as decideConfigPath } from "./config-path-core-DFt-TemS.js";
 import { n as isRecord } from "./coerce-NSst8oRP.js";
-import { A as settingsOf, C as deleteValueAtPath, D as scoreSettingsSearch, E as parsePosthogProjectSelection, M as FILE_ONLY_GROUPS, N as SETTINGS_REGISTRY, O as setValueAtPath, Q as withEnvSecrets, S as cloneValue, T as hasScaledUnit, X as readEnvSecrets, Y as ENV_SECRET_BINDINGS, j as valueAtPath, k as settingsGroupOf, l as saveConfigFileOnce, s as loadConfigFile, u as validateConfig, w as displayText, x as SETTINGS_INDEX } from "./config-store-n23JDU4E.js";
-import { Q as BrowserConfig } from "./contracts-DYQW11de.js";
+import { C as deleteValueAtPath, D as scoreSettingsSearch, E as parsePosthogProjectSelection, N as SETTINGS_REGISTRY, O as setValueAtPath, Q as withEnvSecrets, S as cloneValue, X as readEnvSecrets, Y as ENV_SECRET_BINDINGS, j as valueAtPath, l as saveConfigFileOnce, s as loadConfigFile, u as validateConfig } from "./config-store-DqMScSdg.js";
+import { p as BrowserConfig } from "./contracts-CloExMlS.js";
+import { a as fail, c as listSettings, d as renderSectionTables, f as requireConfigFileSetting, g as valueText, h as succeed, i as describeSetting, l as readSetting, m as settingsRequestForServer, n as configFileViewOf, o as fitColumn, p as sectionOf, r as defaultText, s as getSetting, t as ALL_SETTINGS } from "./settings-readout-core-DrXT4aWm.js";
 import fs from "node:fs";
 import os from "node:os";
 import { parseArgs } from "node:util";
@@ -25,132 +26,12 @@ var usage = `glimmervoid settings: read and change config.json from the command
   A secret (a bot token or API key) is never set or unset here, since a value on the command line lands in shell history;
   change it in the dashboard settings or through its environment variable.
   --json           machine-readable output`;
-var VALUE_COLUMN_WIDTH = 40;
 var EFFECT_NOTES = Object.freeze({
 	now: "A running Glimmervoid applies it without a restart.",
 	"new-sessions": "Sessions started after this change use it.",
 	restart: "Restart Glimmervoid to apply it."
 });
 var HAND_EDITED_SETTING_REASONS = /* @__PURE__ */ new Map([["port", "a listener port that clashes with remote.port stops Glimmervoid from starting"]]);
-var SECTION_BY_SETTING_ID = new Map([...SETTINGS_REGISTRY.sections.flatMap((section) => section.settings.map((setting) => [setting.id, {
-	id: section.id,
-	title: section.title
-}])), ...SETTINGS_REGISTRY.fileOnly.map((setting) => {
-	const groupId = setting.group ?? "";
-	return [setting.id, {
-		id: groupId,
-		title: settingsGroupOf(groupId)?.title ?? groupId
-	}];
-})]);
-var ALL_SETTINGS = [...settingsOf(SETTINGS_REGISTRY.sections), ...SETTINGS_REGISTRY.fileOnly];
-var SECTION_ORDER = [...SETTINGS_REGISTRY.sections.map((section) => ({
-	id: section.id,
-	title: section.title
-})), ...Object.entries(FILE_ONLY_GROUPS).map(([id, group]) => ({
-	id,
-	title: group.title
-}))];
-function fail(message) {
-	return {
-		ok: false,
-		message
-	};
-}
-function succeed(value) {
-	return {
-		ok: true,
-		value
-	};
-}
-function isConfigFileSetting(setting) {
-	return setting.scope === "machine" && setting.control !== "readonly";
-}
-function sectionOf(setting) {
-	return SECTION_BY_SETTING_ID.get(setting.id) ?? {
-		id: "",
-		title: ""
-	};
-}
-function describeSetting(setting) {
-	const descriptor = {
-		id: setting.id,
-		path: setting.path,
-		title: setting.title,
-		description: setting.description,
-		type: setting.control,
-		scope: setting.scope,
-		access: setting.access,
-		effect: setting.takesEffect,
-		default: cloneValue(setting.defaultValue) ?? null,
-		unit: setting.unit?.storedLabel ?? setting.unit?.label ?? null,
-		displayUnit: setting.unit?.label ?? null,
-		storedPerDisplay: setting.unit?.storedPerDisplay ?? 1,
-		section: sectionOf(setting)
-	};
-	if (setting.options) descriptor.options = setting.options.map((option) => option.value);
-	if (setting.range) descriptor.range = setting.range;
-	if (setting.fileOnlyReason) descriptor.fileOnlyReason = setting.fileOnlyReason;
-	return descriptor;
-}
-function isStoredSecret(value) {
-	return typeof value === "string" && value.length > 0;
-}
-function readSetting(setting, view) {
-	const stored = valueAtPath(view.config, setting.path);
-	const source = view.secretSources[setting.path] ?? (stored !== void 0 ? "config.json" : "default");
-	const readout = {
-		...describeSetting(setting),
-		secret: setting.control === "password",
-		source
-	};
-	if (readout.secret) {
-		readout.configured = isStoredSecret(stored);
-		return readout;
-	}
-	readout.value = stored !== void 0 ? cloneValue(stored) : readout.default;
-	return readout;
-}
-function fitColumn(text) {
-	if (text.length <= VALUE_COLUMN_WIDTH) return text;
-	return `${text.slice(0, 37)}...`;
-}
-function storedValueText(setting, value) {
-	if (setting.valueKind) return displayText(setting, value);
-	const stored = JSON.stringify(value ?? null);
-	if (typeof value !== "number" || !hasScaledUnit(setting)) return stored;
-	return `${stored} (${displayText(setting, value)})`;
-}
-function valueText(readout, setting) {
-	if (readout.secret) return readout.configured ? "configured" : "not configured";
-	return storedValueText(setting, readout.value);
-}
-function defaultText(setting) {
-	return storedValueText(setting, setting.defaultValue);
-}
-function settingsBySection(settings) {
-	return SECTION_ORDER.map((section) => ({
-		section,
-		settings: settings.filter((setting) => sectionOf(setting).id === section.id)
-	})).filter((group) => group.settings.length > 0);
-}
-function renderSectionTables(settings, headers, rowOf) {
-	return settingsBySection(settings).map(({ section, settings: grouped }) => renderTable({
-		title: section.title,
-		headers,
-		rows: grouped.map(rowOf),
-		align: headers.map(() => "left")
-	})).join("\n\n");
-}
-function resolveSetting(argument) {
-	return SETTINGS_INDEX.byPath.get(argument) ?? SETTINGS_INDEX.byId.get(argument) ?? null;
-}
-function requireConfigFileSetting(argument, configPath) {
-	const setting = resolveSetting(argument);
-	if (!setting) return fail(`${argument} is not a setting in the registry, so this command cannot read or change it; edit config.json at ${configPath} by hand`);
-	if (setting.scope === "browser") return fail(`${setting.id} is a browser preference saved in each browser, not in config.json; change it in the dashboard under Settings > ${sectionOf(setting).title}`);
-	if (setting.control === "readonly") return fail(`${setting.id} is a read-only status row under Settings > ${sectionOf(setting).title}; it has no config.json key`);
-	return succeed(setting);
-}
 function requirePositional(positionals, index, name) {
 	const value = positionals[index];
 	if (value === void 0) throw new Error(`missing <${name}>\n\n${usage}`);
@@ -284,12 +165,7 @@ function openConfigFile() {
 	if (!decided.path) return fail(`no config.json at ${decided.homePath}. Start Glimmervoid once to create it; glimmervoid settings schema needs no config file`);
 	const loaded = readConfigFile(decided.path, homeDir);
 	if (!loaded.ok) return fail(loaded.message);
-	const secretSources = Object.fromEntries(readEnvSecrets(env).map((secret) => [`${secret.blockName}.${secret.secretKey}`, secret.environmentVariable]));
-	return succeed({
-		configPath: decided.path,
-		config: loaded.value,
-		secretSources
-	});
+	return succeed(configFileViewOf(decided.path, loaded.value, env));
 }
 function print(context, jsonValue, text) {
 	context.writeOutput(`${context.isJson ? JSON.stringify(jsonValue, null, 2) : text}\n`);
@@ -324,35 +200,13 @@ function requireWritableSetting(context, view) {
 }
 var commands = {
 	list: (context) => {
-		const view = requireView();
-		const settings = ALL_SETTINGS.filter(isConfigFileSetting);
-		const readouts = settings.map((setting) => readSetting(setting, view));
-		const readoutById = new Map(readouts.map((readout) => [readout.id, readout]));
-		const rowOf = (setting) => {
-			const readout = readoutById.get(setting.id);
-			if (!readout) return [
-				setting.path,
-				"",
-				""
-			];
-			return [
-				setting.path,
-				fitColumn(valueText(readout, setting)),
-				readout.source
-			];
-		};
-		return print(context, readouts, renderSectionTables(settings, [
-			"Setting",
-			"Value",
-			"Source"
-		], rowOf));
+		const report = listSettings(requireView());
+		return print(context, report.readout, report.text);
 	},
 	get: (context) => {
 		const view = requireView();
-		const setting = requireSetting(context, view);
-		const readout = readSetting(setting, view);
-		const sourceNote = readout.secret && !readout.configured ? "" : ` (${readout.source})`;
-		return print(context, readout, `${setting.path} = ${valueText(readout, setting)}${sourceNote}`);
+		const report = getSetting(view, requireSetting(context, view));
+		return print(context, report.readout, report.text);
 	},
 	set: (context) => {
 		const view = requireView();
@@ -472,6 +326,26 @@ function processIo() {
 		writeError: (text) => process.stderr.write(text)
 	};
 }
+async function runSettingsCli(commandArguments, io = processIo()) {
+	const serverRequest = settingsRequestForServer(commandArguments, process.env);
+	if (!serverRequest) return runSettingsCommand(commandArguments, io);
+	const { askAgentApi } = await import("./agent-api-cli-BBech5lF.js");
+	const reply = AgentSettingsReply.safeParse(await askAgentApi("settings", serverRequest).catch((error) => ({
+		ok: false,
+		error: errorMessage(error)
+	})));
+	if (!reply.success) {
+		io.writeError("settings: Glimmervoid sent a reply this command cannot read\n");
+		return 1;
+	}
+	if (!reply.data.ok) {
+		io.writeError(`settings: ${reply.data.error}\n`);
+		return 1;
+	}
+	const isJson = commandArguments.includes("--json");
+	io.writeOutput(`${isJson ? JSON.stringify(reply.data.readout, null, 2) : reply.data.text}\n`);
+	return 0;
+}
 function runSettingsCommand(commandArguments, io = processIo()) {
 	try {
 		return runCommandLine(commandArguments, io);
@@ -481,4 +355,4 @@ function runSettingsCommand(commandArguments, io = processIo()) {
 	}
 }
 //#endregion
-export { runSettingsCommand };
+export { runSettingsCli };