fleetfizz 0.14.1 → 0.15.0

package/dist/fleetfizz.mjs

@@ -16,7 +16,7 @@ import * as readline from "node:readline";
 import process$1, { cwd, env } from "node:process";
 import tty from "node:tty";
 import { EventEmitter } from "node:events";
-import { types } from "node:util";
+import { stripVTControlCharacters, types } from "node:util";
 //#region \0rolldown/runtime.js
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -3791,7 +3791,7 @@ const ServiceProto = {
 	.../*#__PURE__*/ Prototype({
 		label: "Service",
 		evaluate(fiber) {
-			return exitSucceed(get$3(fiber.context, this));
+			return exitSucceed(get$4(fiber.context, this));
 		}
 	}),
 	toJSON() {
@@ -3807,10 +3807,10 @@ const ServiceProto = {
 		return make$32(this, self);
 	},
 	use(f) {
-		return withFiber$1((fiber) => f(get$3(fiber.context, this)));
+		return withFiber$1((fiber) => f(get$4(fiber.context, this)));
 	},
 	useSync(f) {
-		return withFiber$1((fiber) => exitSucceed(f(get$3(fiber.context, this))));
+		return withFiber$1((fiber) => exitSucceed(f(get$4(fiber.context, this))));
 	}
 };
 const cacheKeys = /*#__PURE__*/ new Set();
@@ -4170,7 +4170,7 @@ const getUnsafe = /*#__PURE__*/ dual(2, (self, service) => {
 * @category getters
 * @since 2.0.0
 */
-const get$3 = getUnsafe;
+const get$4 = getUnsafe;
 const defaultValueCacheKey = "~effect/Context/defaultValue";
 const getDefaultValue = (ref) => {
 	if (defaultValueCacheKey in ref) return ref[defaultValueCacheKey];
@@ -6908,7 +6908,7 @@ var FiberImpl = class {
 		return this._dispatcher ??= this.cache.scheduler.makeDispatcher();
 	}
 	getRef(ref) {
-		return get$3(this.context, ref);
+		return get$4(this.context, ref);
 	}
 	addObserver(cb) {
 		if (this._exit) {
@@ -7066,17 +7066,17 @@ var FiberImpl = class {
 const makeFiberContextCache = (context) => {
 	const currentTracer = getOrUndefinedUnsafe(context, TracerKey);
 	return {
-		scheduler: get$3(context, Scheduler),
+		scheduler: get$4(context, Scheduler),
 		tracer: currentTracer,
 		tracerContext: currentTracer ? currentTracer["context"] : void 0,
-		tracerEnabled: get$3(context, TracerEnabled),
+		tracerEnabled: get$4(context, TracerEnabled),
 		span: getOrUndefinedUnsafe(context, ParentSpanKey),
-		logLevel: get$3(context, CurrentLogLevel),
-		minimumLogLevel: get$3(context, MinimumLogLevel$1),
-		stackFrame: get$3(context, CurrentStackFrame),
+		logLevel: get$4(context, CurrentLogLevel),
+		minimumLogLevel: get$4(context, MinimumLogLevel$1),
+		stackFrame: get$4(context, CurrentStackFrame),
 		runtimeMetrics: getOrUndefinedUnsafe(context, FiberRuntimeMetricsKey),
-		maxOpsBeforeYield: get$3(context, MaxOpsBeforeYield),
-		preventYield: get$3(context, PreventSchedulerYield)
+		maxOpsBeforeYield: get$4(context, MaxOpsBeforeYield),
+		preventYield: get$4(context, PreventSchedulerYield)
 	};
 };
 const deferredInterruptCont = {
@@ -8434,11 +8434,11 @@ const NoopSpanProto = {
 const noopSpan = (options) => Object.assign(Object.create(NoopSpanProto), options);
 const filterDisablePropagation = (span) => {
 	if (!span) return none();
-	return get$3(span.annotations, DisablePropagation) ? span._tag === "Span" ? filterDisablePropagation(getOrUndefined$1(span.parent)) : none() : some(span);
+	return get$4(span.annotations, DisablePropagation) ? span._tag === "Span" ? filterDisablePropagation(getOrUndefined$1(span.parent)) : none() : some(span);
 };
 /** @internal */
 const makeSpanUnsafe = (fiber, name, options) => {
-	const disablePropagation = !fiber.cache.tracerEnabled || options?.annotations && get$3(options.annotations, DisablePropagation);
+	const disablePropagation = !fiber.cache.tracerEnabled || options?.annotations && get$4(options.annotations, DisablePropagation);
 	const parent = options?.parent !== void 0 ? some(options.parent) : options?.root ? none() : filterDisablePropagation(fiber.cache.span);
 	let span;
 	if (disablePropagation) span = noopSpan({
@@ -18071,7 +18071,7 @@ var RcRefImpl = class {
 /** @internal */
 const make$24 = (options) => withFiber((fiber) => {
 	const context = fiber.context;
-	const scope = get$3(context, Scope);
+	const scope = get$4(context, Scope);
 	const ref = new RcRefImpl(options.acquire, context, scope, options.idleTimeToLive !== void 0 ? fromInputUnsafe$1(options.idleTimeToLive) : void 0);
 	return as(addFinalizerExit(scope, () => {
 		const state = ref.state;
@@ -18134,7 +18134,7 @@ const awaitAcquiring = (self, acquiring, restore) => onExit$1(restore(join(acqui
 	return interrupt(acquiring.fiber);
 });
 /** @internal */
-const get$2 = (self_) => {
+const get$3 = (self_) => {
 	const self = self_;
 	return uninterruptibleMask((restore) => flatMap$1(scope, (scope) => flatMap$1(getState(self, restore), (state) => as(addFinalizerExit(scope, () => release(self, state)), state.value))));
 };
@@ -18252,7 +18252,7 @@ const make$23 = make$24;
 * @category combinators
 * @since 3.5.0
 */
-const get$1 = get$2;
+const get$2 = get$3;
 //#endregion
 //#region ../../node_modules/.pnpm/effect@4.0.2/node_modules/effect/dist/Stream.js
 /**
@@ -24846,7 +24846,7 @@ const TypeId$15 = /*#__PURE__*/ Symbol.for("~effect/http/Headers");
 const Proto$7 = /*#__PURE__*/ Object.defineProperties(/*#__PURE__*/ Object.create(null), {
 	[TypeId$15]: { value: TypeId$15 },
 	[symbolRedactable]: { value(context) {
-		return redact(this, get$3(context, CurrentRedactedNames));
+		return redact(this, get$4(context, CurrentRedactedNames));
 	} },
 	toJSON: { value() {
 		return redact$1(this);
@@ -28692,13 +28692,13 @@ const layer$5 = /*#__PURE__*/ effect(Terminal, /*#__PURE__*/ (/* @__PURE__ */ fn
 		stdin.on("keypress", handleKeypress);
 		if (inputEnded) handleEnd();
 		else {
-			yield* get$1(rlRef);
+			yield* get$2(rlRef);
 			stdin.once("end", handleEnd);
 		}
 		return queue;
 	});
 	const readLine = suspend$2(() => poll(lines).pipe(flatMap$1(match$5({
-		onNone: () => scoped(andThen(get$1(rlRef), take(lines))),
+		onNone: () => scoped(andThen(get$2(rlRef), take(lines))),
 		onSome: succeed$3
 	})), mapError(() => new QuitError({}))));
 	const display = (prompt) => uninterruptible(callback$1((resume) => {
@@ -35654,7 +35654,7 @@ const runWith = (command, config) => {
 };
 //#endregion
 //#region package.json
-var version = "0.14.1";
+var version = "0.15.0";
 //#endregion
 //#region ../../node_modules/.pnpm/jsonc-parser@3.3.1/node_modules/jsonc-parser/lib/esm/impl/scanner.js
 /**
@@ -38460,7 +38460,8 @@ const ReposSection = section({ cloneRoot: optionalKey(variants(withShorthand(Str
 	encode: (root) => root.path
 }))).annotateKey({ description: `Where a Machine keeps its Managed Clones: a path, or a list of \`{ path, platforms?, machines? }\` where a Machine gets the first that targets it. \`~\` expands on that Machine. Default: \`${DEFAULT_CLONE_ROOT}\`.` }) }, Record(NonEmptyString, variants(TrackedRepo)), `Tracked Repos, keyed by name, which names the Managed Clone and the \`repos:<name>\` Item. Each is \`{ origin, ref, install, ... }\`, ${VARIANTS}.`);
 const ITEM_NAME = /^[A-Za-z0-9._-]+$/;
-const badName = (names) => names.find((n) => !ITEM_NAME.test(n) || n === "." || n === "..");
+const isItemName = (name) => ITEM_NAME.test(name) && name !== "." && name !== "..";
+const badName = (names) => names.find((name) => !isItemName(name));
 const HomePath = NonEmptyString.check(isPattern(/^(\/|~\/)./, {
 	title: "path",
 	description: "an absolute path, or one under ~"
@@ -38562,6 +38563,11 @@ var ConfigNotFound = class extends TaggedError()("ConfigNotFound", { path: Strin
 		return `no config at ${this.path}; run fizz init to write one, or pass --config`;
 	}
 };
+var ConfigIsLink = class extends TaggedError()("ConfigIsLink", { path: String$6 }) {
+	get message() {
+		return `${this.path} is a symlink. fleetfizz copies the config to every Machine itself, so it must be a regular file; to keep its history, put its directory under git instead`;
+	}
+};
 const lineOf = (text, offset) => text.slice(0, offset).split("\n").length;
 const repeatedKeys = (text) => {
 	const problems = [];
@@ -38637,10 +38643,19 @@ const parseConfig = fn("parseConfig")(function* (path, text) {
 	})));
 });
 const formatIssue = makeFormatterDefault();
-const loadConfig = fn("loadConfig")(function* (path) {
+const refuseLink = fn("refuseLink")(function* (path) {
 	const fs = yield* FileSystem;
-	if (!(yield* fs.exists(path))) return yield* new ConfigNotFound({ path });
-	const text = yield* fs.readFileString(path);
+	if (isSome(yield* option(fs.readLink(path)))) return yield* new ConfigIsLink({ path });
+});
+const readConfigText = fn("readConfigText")(function* (path) {
+	yield* refuseLink(path);
+	const fs = yield* FileSystem;
+	if (!(yield* fs.exists(path))) return void 0;
+	return yield* fs.readFileString(path);
+});
+const loadConfig = fn("loadConfig")(function* (path) {
+	const text = yield* readConfigText(path);
+	if (text === void 0) return yield* new ConfigNotFound({ path });
 	return yield* parseConfig(path, text);
 });
 //#endregion
@@ -38766,9 +38781,11 @@ const insertSpread = (text, path, value) => {
 	const result = insertText(text, path, value);
 	if (!("text" in result)) return result;
 	const at = firstDifference(text, result.text);
-	if (lineLength(result.text, at) <= WIDTH) return result;
+	const tooLong = lineLength(result.text, at) > WIDTH;
+	const added = result.text.slice(at, at + result.text.length - text.length);
+	if (!tooLong && !added.includes("\n")) return result;
 	const container = oneLineAround(text, parse$2(text), Math.min(at, text.length - 1));
-	if (container === void 0) return result;
+	if (container === void 0 || !tooLong && at >= container.offset + container.length - 1) return result;
 	const spreadText = spread(text, container);
 	return sameComments(text, spreadText) ? insertSpread(spreadText, path, value) : result;
 };
@@ -38863,12 +38880,12 @@ const targetingLists = (text, machine) => {
 };
 const saveConfig = fn("saveConfig")(function* (path, text) {
 	const config = yield* parseConfig(path, text);
+	yield* refuseLink(path);
 	const fs = yield* FileSystem;
-	const target = (yield* fs.exists(path)) ? yield* fs.realPath(path) : path;
-	yield* fs.makeDirectory((yield* Path$1).dirname(target), { recursive: true });
-	yield* fs.writeFileString(`${target}.tmp`, text);
-	if (yield* fs.exists(target)) yield* fs.chmod(`${target}.tmp`, (yield* fs.stat(target)).mode & 4095);
-	yield* fs.rename(`${target}.tmp`, target);
+	yield* fs.makeDirectory((yield* Path$1).dirname(path), { recursive: true });
+	yield* fs.writeFileString(`${path}.tmp`, text);
+	if (yield* fs.exists(path)) yield* fs.chmod(`${path}.tmp`, (yield* fs.stat(path)).mode & 4095);
+	yield* fs.rename(`${path}.tmp`, path);
 	return config;
 });
 //#endregion
@@ -39196,6 +39213,10 @@ const EngineFact = Union([
 		sha: optionalKey(String$6),
 		base64: optionalKey(String$6)
 	}),
+	Struct({
+		fact: Literal("configLink"),
+		path: String$6
+	}),
 	Struct({
 		fact: Literal("configRecord"),
 		record: Unknown
@@ -39250,6 +39271,12 @@ const assembleState = (facts) => {
 						}
 					};
 					break;
+				case "configLink":
+					state = {
+						...state,
+						configLink: f.path
+					};
+					break;
 				case "configRecord":
 					state = {
 						...state,
@@ -39341,7 +39368,7 @@ const checkScript = (input) => {
 		lines.push(provider.observe(items, input.scope));
 		if (provider.rule === "record") for (const item of items) lines.push(...recordFact(provider.name, item.name));
 	}
-	lines.push(`ff_c=${CONFIG_DIR_SH}/${quote(CONFIG_FILE)}`, `if [ -f "$ff_c" ]; then ff_b=$(base64 < "$ff_c" | tr -d '\\n'); ff_state "{\\"fact\\":\\"config\\",\\"present\\":true,\\"sha\\":\\"$(printf '%s' "$ff_b" | base64 -d | ff_sha)\\",\\"base64\\":\\"$ff_b\\"}"; else ff_state '{"fact":"config","present":false}'; fi`, `ff_r=${quotePath(CONFIG_RECORD)}`, `if [ -f "$ff_r" ]; then ff_state "{\\"fact\\":\\"configRecord\\",\\"record\\":$(tr -d '\\n' < "$ff_r")}"; fi`);
+	lines.push(`ff_c=${CONFIG_DIR_SH}/${quote(CONFIG_FILE)}`, `if [ -L "$ff_c" ]; then ff_state "{\\"fact\\":\\"configLink\\",\\"path\\":\\"$(ff_json "$ff_c")\\"}"; elif [ -f "$ff_c" ]; then ff_b=$(base64 < "$ff_c" | tr -d '\\n'); ff_state "{\\"fact\\":\\"config\\",\\"present\\":true,\\"sha\\":\\"$(printf '%s' "$ff_b" | base64 -d | ff_sha)\\",\\"base64\\":\\"$ff_b\\"}"; else ff_state '{"fact":"config","present":false}'; fi`, `ff_r=${quotePath(CONFIG_RECORD)}`, `if [ -f "$ff_r" ]; then ff_state "{\\"fact\\":\\"configRecord\\",\\"record\\":$(tr -d '\\n' < "$ff_r")}"; fi`);
 	lines.push(`ff_state '{"fact":"end"}'`);
 	return lines.join("\n");
 };
@@ -39479,7 +39506,7 @@ const applyScript = (plan, configRecord, init) => {
 		`IFS= read -r ff_schema || ff_schema=""`,
 		...inputsOf(plan).map((_, i) => `IFS= read -r ff_in_${i} || exit 1`),
 		`ff_git() { if [ -n "$ff_token" ]; then FF_TOKEN="$ff_token" git -c credential.helper= -c 'credential.helper=!f() { echo username=x-access-token; echo "password=$FF_TOKEN"; }; f' "$@"; else git "$@"; fi; }`,
-		`ff_skills() { if [ -n "$ff_token" ]; then GH_TOKEN="$ff_token" GIT_CONFIG_COUNT=2 GIT_CONFIG_KEY_0=credential.helper GIT_CONFIG_VALUE_0= GIT_CONFIG_KEY_1=credential.helper GIT_CONFIG_VALUE_1='!f() { echo username=x-access-token; echo "password=$GH_TOKEN"; }; f' DISABLE_TELEMETRY=1 skills "$@"; else DISABLE_TELEMETRY=1 skills "$@"; fi; }`,
+		`ff_skills() { if [ -n "$ff_token" ]; then GH_TOKEN="$ff_token" GIT_CONFIG_COUNT=3 GIT_CONFIG_KEY_0=core.autocrlf GIT_CONFIG_VALUE_0=false GIT_CONFIG_KEY_1=credential.helper GIT_CONFIG_VALUE_1= GIT_CONFIG_KEY_2=credential.helper GIT_CONFIG_VALUE_2='!f() { echo username=x-access-token; echo "password=$GH_TOKEN"; }; f' DISABLE_TELEMETRY=1 skills "$@"; else GIT_CONFIG_COUNT=1 GIT_CONFIG_KEY_0=core.autocrlf GIT_CONFIG_VALUE_0=false DISABLE_TELEMETRY=1 skills "$@"; fi; }`,
 		...configStep(configRecord),
 		...plan.providers.flatMap((p) => providerSteps(p, offsets)),
 		doneLine("end", true)
@@ -40091,7 +40118,7 @@ const decideFile = (item, observed, resolved, ctx) => {
 	};
 	const recorded = record === void 0 ? void 0 : fingerprint(recordEntries(record));
 	const same = ctx.machine.name === from || current !== void 0 && fingerprint(current) === ours;
-	const rerun = same && item.after !== void 0 ? ctx.rebuild(subject) ? "--rebuild" : ctx.machine.name !== from && recorded !== ours ? "its after has not finished" : void 0 : void 0;
+	const rerun = same && item.after !== void 0 ? ctx.rebuild(subject) ? "--rebuild" : ctx.machine.name === from || recorded === ours ? void 0 : recorded === void 0 ? "its after has not succeeded here" : "its after has not finished" : void 0;
 	if (rerun !== void 0) return {
 		kind: "change",
 		item: item.name,
@@ -41311,7 +41338,7 @@ const make$2 = (method) => (url, options) => modify(empty, {
 * @category constructors
 * @since 4.0.0
 */
-const get = /*#__PURE__*/ make$2("GET");
+const get$1 = /*#__PURE__*/ make$2("GET");
 /**
 * Applies request options to an `HttpClientRequest`, returning a new request.
 *
@@ -41705,6 +41732,14 @@ const accessor = (method) => (...args) => flatMap$1(HttpClient, (client) => clie
 */
 const execute = /*#__PURE__*/ accessor("execute");
 /**
+* Executes a `GET` request using the `HttpClient` service from the environment.
+*
+* @stability unstable
+* @category accessors
+* @since 4.0.0
+*/
+const get = /*#__PURE__*/ accessor("get");
+/**
 * Transforms a client by applying an effectful transformation to each response effect.
 *
 * @stability unstable
@@ -42101,7 +42136,8 @@ const treeHash = (dir) => {
   try {
     execFileSync("git", ["init", "-q", "--bare", git]);
     const env = { ...process.env, GIT_DIR: git, GIT_INDEX_FILE: join(git, "index") };
-    execFileSync("git", ["--work-tree", dir, "add", "-A", "-f", "."], { cwd: dir, env, stdio: "ignore" });
+    // As ff_skills clones: no line-ending conversion, so the hash is GitHub's.
+    execFileSync("git", ["-c", "core.autocrlf=false", "--work-tree", dir, "add", "-A", "-f", "."], { cwd: dir, env, stdio: "ignore" });
     return execFileSync("git", ["write-tree"], { env, encoding: "utf8" }).trim();
   } catch {
     return undefined;
@@ -42200,16 +42236,18 @@ const TreeResponse = Struct({
 		path: String$6,
 		type: String$6,
 		sha: String$6
-	}))
+	})),
+	truncated: Boolean$4
 });
 const fetchFolders = fn("fetchFolders")(function* (repo, ref, token) {
-	const response = yield* execute(get(`https://api.github.com/repos/${repo}/git/trees/${encodeURIComponent(ref ?? "HEAD")}?recursive=1`).pipe(setHeaders({
+	const response = yield* execute(get$1(`https://api.github.com/repos/${repo}/git/trees/${encodeURIComponent(ref ?? "HEAD")}?recursive=1`).pipe(setHeaders({
 		Accept: "application/vnd.github+json",
 		"User-Agent": "fleetfizz"
 	}), (request) => token === void 0 ? request : bearerToken(request, token)));
 	if (response.status === 404) return { error: `no ${ref ?? "default branch"} in ${repo}, or no access to it` };
 	if (response.status !== 200) return { error: `GitHub answered ${response.status}` };
 	const body = yield* schemaBodyJson(TreeResponse)(response);
+	if (body.truncated) return { error: "the repo is too large for GitHub to list its folders" };
 	return { folders: new Map([["", body.sha], ...body.tree.flatMap((e) => e.type === "tree" ? [[e.path, e.sha]] : [])]) };
 }, timeout("15 seconds"), orElseSucceed(() => ({ error: "could not reach GitHub" })), provide(layer$2));
 const skillQuestion = (subject, found, problem) => ({
@@ -73448,6 +73486,72 @@ const changeText = (path, before, after, summary) => toText(/* @__PURE__ */ (0,
 	]
 }));
 //#endregion
+//#region src/localSkills.ts
+const decodeLock = decodeUnknownOption(fromJsonString(Struct({
+	version: Number$2,
+	skills: Record(String$6, Struct({
+		source: String$6,
+		sourceType: String$6,
+		ref: optionalKey(String$6)
+	}))
+})));
+/**
+* The Skills in the CLI's lock, read where the CLI keeps it, that every
+* Machine can install: a GitHub source and a name the config can hold. One
+* from a path here, or a folder the CLI did not install, has no source another
+* Machine has. None when the lock is missing or from an older CLI.
+*/
+const localSkills = fn("localSkills")(function* () {
+	const fs = yield* FileSystem;
+	const state = process.env.XDG_STATE_HOME;
+	const path = state === void 0 || state === "" ? expandHome("~/.agents/.skill-lock.json") : `${state}/skills/.skill-lock.json`;
+	const lock = decodeLock(yield* fs.readFileString(path).pipe(orElseSucceed(() => "")));
+	if (lock._tag === "None" || lock.value.version < 3) return [];
+	return Object.entries(lock.value.skills).filter(([name, entry]) => entry.sourceType === "github" && isItemName(name)).map(([name, entry]) => ({
+		name,
+		source: entry.source,
+		...entry.ref === void 0 ? {} : { ref: entry.ref }
+	})).sort((a, b) => a.name.localeCompare(b.name));
+});
+const NO_TELEMETRY = { DISABLE_TELEMETRY: "1" };
+const decodeList = decodeUnknownOption(fromJsonString(ArraySchema(Struct({ agents: ArraySchema(String$6) }))));
+/**
+* The Agents the skills CLI sees Skills installed for here, as the ids
+* `skills add -a` takes, or none when the CLI is not here. `skills ls --json`
+* names them for display ("Claude Code" is `claude-code`), the way most ids
+* are written; the few that are not (`roo` is "Roo Code") the CLI rejects,
+* and they are dropped.
+*/
+const localAgents = fn("localAgents")(function* () {
+	const listed = yield* runLocal("skills", [
+		"ls",
+		"-g",
+		"--json"
+	], NO_TELEMETRY);
+	const list = listed.code === 0 ? decodeList(listed.stdout) : void 0;
+	const ids = list === void 0 || list._tag === "None" ? [] : [...new Set(list.value.flatMap((skill) => skill.agents.map((agent) => agent.toLowerCase().replace(/\s+/g, "-"))))];
+	if (ids.length === 0) return ids;
+	const validated = yield* runLocal("skills", [
+		"ls",
+		"-g",
+		"-a",
+		...ids,
+		"--json"
+	], NO_TELEMETRY);
+	const invalid = validated.code === 0 ? [] : /Invalid agents: (.*)/.exec(stripVTControlCharacters(validated.stdout))?.[1]?.split(", ") ?? ids;
+	return ids.filter((id) => !invalid.includes(id));
+});
+/** The skills section's `agents`, picked from `agents`, all picked to start. */
+const pickAgents = (agents) => MultiSelect({
+	message: "Which agents are skills installed for? (skills CLI ids)",
+	choices: agents.map((agent) => ({
+		title: agent,
+		value: agent,
+		selected: true
+	})),
+	min: 1
+});
+//#endregion
 //#region src/configAdd.tsx
 var ConfigAddError = class extends TaggedError()("ConfigAddError", { reason: String$6 }) {
 	get message() {
@@ -73468,6 +73572,13 @@ const fileEntry = (path, exclude, targeting) => untargeted(targeting) && exclude
 	...exclude.length > 0 ? { exclude } : {},
 	...targeting
 };
+/** A Skill's entry: its source alone, or `{ source, ref, agents, ... }` when it has more. */
+const skillEntry = (source, ref, agents, targeting) => ref === void 0 && agents.length === 0 && untargeted(targeting) ? source : {
+	source,
+	...ref === void 0 ? {} : { ref },
+	...agents.length > 0 ? { agents } : {},
+	...targeting
+};
 const parseSpec = (spec) => {
 	const at = spec.lastIndexOf("@");
 	return at > 0 ? {
@@ -73478,9 +73589,8 @@ const parseSpec = (spec) => {
 const fileName = (path) => (path.replace(/\/+$/, "").split("/").at(-1) ?? "").replace(/^\.+/, "").replace(/[^A-Za-z0-9._-]/g, "-");
 const openConfig = fn("openConfig")(function* (flag) {
 	const path = flag ?? configPath(process.env);
-	const fs = yield* FileSystem;
-	if (!(yield* fs.exists(path))) return yield* new ConfigAddError({ reason: `no config at ${homeRelative(path)}; run fizz init to write one, or pass --config` });
-	const text = yield* fs.readFileString(path);
+	const text = yield* readConfigText(path);
+	if (text === void 0) return yield* new ConfigAddError({ reason: `no config at ${homeRelative(path)}; run fizz init to write one, or pass --config` });
 	return {
 		path,
 		text,
@@ -73503,18 +73613,24 @@ const addItem = fn("addItem")(function* (input) {
 	if (unknown.length > 0) return yield* new ConfigAddError({ reason: `not in machines: ${unknown.join(", ")} (add it with fizz config add machines)` });
 	const tailnet = yield* readTailnet();
 	const linux = config.machines.some((m) => tailnet.fleet.find((f) => f.name === m)?.platform === "linux");
-	const start = input.provider === "cask" && linux && config.cask?.platforms === void 0 ? insertAt(text, ["cask", "platforms"], ["darwin"]) : { text };
-	if ("reason" in start) return yield* new ConfigAddError({ reason: start.reason });
-	const at = [
-		input.provider,
-		"items",
-		input.name
+	const edits = [
+		...input.provider === "cask" && linux && config.cask?.platforms === void 0 ? [[["cask", "platforms"], ["darwin"]]] : [],
+		...input.section ?? [],
+		[[
+			input.provider,
+			"items",
+			input.name
+		], input.entry]
 	];
-	const result = insertAt(start.text, at, input.entry);
-	if ("reason" in result) return yield* new ConfigAddError({ reason: result.reason });
-	const saved = yield* saveConfig(path, result.text);
+	let next = text;
+	for (const [at, value] of edits) {
+		const edited = insertAt(next, at, value);
+		if ("reason" in edited) return yield* new ConfigAddError({ reason: edited.reason });
+		next = edited.text;
+	}
+	const saved = yield* saveConfig(path, next);
 	const to = reach(saved, tailnet, input.provider, input.targeting);
-	yield* log(changeText(path, text, result.text, /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
+	yield* log(changeText(path, text, next, /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
 		/* @__PURE__ */ (0, import_jsx_runtime.jsx)(T, {
 			tone: "ok",
 			children: "added"
@@ -73575,6 +73691,40 @@ const addHomebrew = fn("addHomebrew")(function* (input) {
 		notes
 	});
 });
+/** The skills section's first `agents`, picked from the Agents the skills CLI sees here. */
+const pickHere = fn("pickHere")(function* () {
+	const here = yield* localAgents();
+	if (here.length === 0) return yield* new ConfigAddError({ reason: "the skills CLI sees no agents here; pass --agent" });
+	return yield* pickAgents(here);
+});
+/**
+* `fizz config add skills <name>`. The source and ref default to the ones the
+* skills CLI installed it from here. The first Skill also writes the section's
+* `agents`, from --agent or a pick of the Agents here; after that, --agent is
+* the Skill's own.
+*/
+const addSkill = fn("addSkill")(function* (input) {
+	const { config } = yield* openConfig(input.config);
+	const ask = interactive();
+	const here = input.source === void 0 ? (yield* localSkills()).find((skill) => skill.name === input.name) : void 0;
+	const source = input.source ?? here?.source ?? (ask ? yield* String$4({
+		message: "Source (`owner/repo` on GitHub, or any source skills add takes)",
+		validate: (value) => value.trim() === "" ? fail$3("a source is needed") : succeed$3(value.trim())
+	}) : yield* needs("--source"));
+	const ref = input.ref ?? here?.ref;
+	const agents = [...new Set(input.agents)];
+	const section = config.skills !== void 0 ? [] : [[["skills", "agents"], agents.length > 0 ? agents : !ask ? yield* needs("--agent") : yield* pickHere()]];
+	const targeting = targetingOf(input.targeting);
+	yield* addItem({
+		config: input.config,
+		provider: "skills",
+		name: input.name,
+		entry: skillEntry(source, ref, section.length > 0 ? [] : agents, targeting),
+		targeting,
+		section,
+		notes: PACKAGE_MANAGERS.some((pm) => config[pm]?.items?.skills !== void 0) ? [] : [`No package manager in the config installs the skills CLI; add it with fizz config add ${PACKAGE_MANAGERS.join("|")} skills`]
+	});
+});
 const defaultBranch = fn("defaultBranch")(function* (origin) {
 	const remote = yield* runLocal("git", [
 		"ls-remote",
@@ -74391,6 +74541,12 @@ const check = fn("check")(function* (target, script, ledger) {
 		yield* ledger.fail(target.name, ["checking did not finish", ...output]);
 		return { kind: "failed" };
 	}
+	if (state.configLink !== void 0) {
+		const { configLink: link, home } = state;
+		const path = home !== void 0 && link.startsWith(`${home}/`) ? `~${link.slice(home.length)}` : link;
+		yield* ledger.fail(target.name, [new ConfigIsLink({ path }).message]);
+		return { kind: "failed" };
+	}
 	return {
 		kind: "checked",
 		state
@@ -74946,33 +75102,74 @@ const DOTFILES = [
 ];
 const draftText = (picks) => {
 	const edits = [
-		...picks.globals.map((g) => [[
-			g.pm,
-			"items",
-			g.name
-		], `^${g.version}`]),
-		...picks.formulae.map((f) => [[
-			"brew",
-			"items",
+		...picks.machines.map((m, i) => [
+			m,
+			["machines", i],
+			m
+		]),
+		...picks.globals.map((g) => [
+			g.name,
+			[
+				g.pm,
+				"items",
+				g.name
+			],
+			`^${g.version}`
+		]),
+		...picks.formulae.map((f) => [
+			f.name,
+			[
+				"brew",
+				"items",
+				f.name
+			],
+			rangeEntry("*", picks.linux && f.macos ? { platforms: ["darwin"] } : {})
+		]),
+		...picks.casks.length > 0 && picks.linux ? [[
+			"the cask platforms",
+			["cask", "platforms"],
+			["darwin"]
+		]] : [],
+		...picks.casks.map((c) => [
+			c,
+			[
+				"cask",
+				"items",
+				c
+			],
+			"*"
+		]),
+		...picks.skills.length > 0 ? [[
+			"the skills agents",
+			["skills", "agents"],
+			picks.agents
+		]] : [],
+		...picks.skills.map((skill) => [
+			skill.name,
+			[
+				"skills",
+				"items",
+				skill.name
+			],
+			skillEntry(skill.source, skill.ref, [], {})
+		]),
+		...picks.files.map((f) => [
+			f,
+			[
+				"files",
+				"items",
+				fileName(f)
+			],
 			f
-		], "*"]),
-		...picks.casks.length > 0 && picks.linux ? [[["cask", "platforms"], ["darwin"]]] : [],
-		...picks.casks.map((c) => [[
-			"cask",
-			"items",
-			c
-		], "*"]),
-		...picks.files.map((f) => [[
-			"files",
-			"items",
-			fileName(f)
-		], f])
+		])
 	];
-	const start = `{\n  "$schema": "./${SCHEMA_FILE}",\n  "version": ${JSON.stringify(picks.version)},\n  "machines": [],\n}\n`;
-	return [...picks.machines.map((m, i) => [["machines", i], m]), ...edits].reduce((text, [path, value]) => {
+	let text = `{\n  "$schema": "./${SCHEMA_FILE}",\n  "version": ${JSON.stringify(picks.version)},\n  "machines": [],\n}\n`;
+	for (const [pick, path, value] of edits) {
 		const result = insertAt(text, path, value);
-		return "text" in result ? result.text : text;
-	}, start);
+		if ("reason" in result) return { reason: `fizz init could not add ${pick}: ${result.reason}` };
+		text = result.text;
+	}
+	return { text };
 };
 const CheckLine = (props) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(T, {
 	tone: props.check.ok ? "ok" : props.check.required ? "fail" : "skip",
@@ -75002,6 +75199,39 @@ const lines = fn("lines")(function* (command, args) {
 	const ran = yield* runLocal(command, args);
 	return ran.code === 0 ? ran.stdout.split("\n").filter((l) => l.trim() !== "") : [];
 });
+const Requirements = ArraySchema(Struct({ name: String$6 }));
+const FormulaInfo = Struct({
+	requirements: Requirements,
+	variations: optionalKey(NullOr(Record(String$6, Struct({ requirements: optionalKey(Requirements) }))))
+});
+const macosOnly = (f) => {
+	const linux = Object.entries(f.variations ?? {}).flatMap(([tag, v]) => tag.endsWith("_linux") ? [v.requirements ?? f.requirements] : []);
+	return (linux.length > 0 ? linux : [f.requirements]).every((rs) => rs.some((r) => r.name === "macos"));
+};
+const BrewInfo = fromJsonString(Struct({ formulae: ArraySchema(Struct({
+	...FormulaInfo.fields,
+	full_name: String$6
+})) }));
+const coreMacosOnly = fn("coreMacosOnly")(function* (name) {
+	const response = yield* get(`https://formulae.brew.sh/api/formula/${name}.json`);
+	return macosOnly(yield* schemaBodyJson(FormulaInfo)(response));
+}, timeout("10 seconds"), orElseSucceed(() => false), provide(layer$2));
+const tappedMacosOnly = fn("tappedMacosOnly")(function* (names) {
+	if (names.length === 0) return [];
+	const ran = yield* runLocal("brew", [
+		"info",
+		"--json=v2",
+		"--variations",
+		"--formula",
+		...names
+	]);
+	return (yield* decodeEffect(BrewInfo)(ran.stdout)).formulae.filter(macosOnly).map((f) => f.full_name);
+}, orElseSucceed(() => []));
+const macosFormulae = fn("macosFormulae")(function* (names) {
+	const tapped = yield* tappedMacosOnly(names.filter((n) => n.includes("/")));
+	const core = yield* filter(names.filter((n) => !n.includes("/")), coreMacosOnly, { concurrency: 8 });
+	return /* @__PURE__ */ new Set([...tapped, ...core]);
+});
 const pickSome = (message, choices) => choices.length === 0 ? succeed$3([]) : MultiSelect({
 	message,
 	choices,
@@ -75032,8 +75262,9 @@ const init = fn("init")(function* (flags) {
 		return;
 	}
 	const tailnet = yield* readTailnet();
-	if (yield* fs.exists(path)) {
-		const config = yield* loadConfig(path);
+	const existing = yield* readConfigText(path);
+	if (existing !== void 0) {
+		const config = yield* parseConfig(path, existing);
 		yield* log(`\n${configText({
 			path,
 			config,
@@ -75051,35 +75282,57 @@ const init = fn("init")(function* (flags) {
 		name,
 		version
 	})))))).flat().filter((g) => g.name !== SELF_PACKAGE);
-	const globals = yield* pickSome(`Which Globals from this Machine? (${installed.length} installed)`, installed.map((g) => ({
+	const pickedGlobals = yield* pickSome(`Which Globals from this Machine? (${installed.length} installed)`, installed.map((g) => ({
 		title: `${g.name}  ${g.version}  ${g.pm}`,
 		value: g
 	})));
+	const linux = machines.some((m) => tailnet.fleet.find((f) => f.name === m)?.platform === "linux");
 	const leaves = yield* lines("brew", ["leaves", "--installed-on-request"]);
-	const formulae = yield* pickSome(`Which Formulae from this Machine? (${leaves.length} installed on request)`, leaves.map((f) => ({
+	const pickedFormulae = yield* pickSome(`Which Formulae from this Machine? (${leaves.length} installed on request)`, leaves.map((f) => ({
 		title: f,
 		value: f
 	})));
+	const macos = linux ? yield* macosFormulae(pickedFormulae) : /* @__PURE__ */ new Set();
+	const formulae = pickedFormulae.map((name) => ({
+		name,
+		macos: macos.has(name)
+	}));
 	const installedCasks = process.platform === "darwin" ? yield* lines("brew", ["list", "--cask"]) : [];
 	const casks = yield* pickSome(`Which Casks from this Machine? (${installedCasks.length} installed)`, installedCasks.map((c) => ({
 		title: c,
 		value: c
 	})));
+	const agentsHere = yield* localAgents();
+	const fromGitHub = agentsHere.length === 0 ? [] : yield* localSkills();
+	const skills = yield* pickSome(`Which skills from this Machine? (${fromGitHub.length} installed from GitHub)`, fromGitHub.map((skill) => ({
+		title: `${skill.name}  ${skill.source}${skill.ref === void 0 ? "" : `#${skill.ref}`}`,
+		value: skill,
+		selected: true
+	})));
+	const agents = skills.length === 0 ? [] : yield* pickAgents(agentsHere);
+	const cli = installed.find((global) => global.name === "skills");
+	const addCli = cli !== void 0 && skills.length > 0 && !pickedGlobals.some((global) => global.name === "skills");
+	const globals = addCli ? [...pickedGlobals, cli] : pickedGlobals;
+	if (addCli) yield* log(`The skills CLI is in the config too, as a ${cli.pm} Global: a Ship installs skills with it.`);
+	if (cli === void 0 && skills.length > 0) yield* log(`No package manager here has the skills CLI, so a Ship cannot install skills; add it with fizz config add ${PACKAGE_MANAGERS.join("|")} skills.`);
 	const present = yield* filter(DOTFILES, (f) => fs.exists(expandHome(f)));
 	const files = yield* pickSome("Which Shared Files? A Ship copies each from the Machine it starts on.", present.map((f) => ({
 		title: f,
 		value: f
 	})));
-	const text = draftText({
+	const draft = draftText({
 		version: flags.version,
 		machines,
 		globals,
 		formulae,
 		casks,
+		skills,
+		agents,
 		files,
-		linux: machines.some((m) => tailnet.fleet.find((f) => f.name === m)?.platform === "linux")
+		linux
 	});
-	const config = yield* saveConfig(path, text);
+	if ("reason" in draft) return yield* new ConfigAddError({ reason: draft.reason });
+	const config = yield* saveConfig(path, draft.text);
 	const paths = yield* Path$1;
 	yield* fs.writeFileString(paths.join(paths.dirname(path), SCHEMA_FILE), fleetConfigSchemaText());
 	yield* log(`\n${toText(/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(T, {
@@ -75090,7 +75343,7 @@ const init = fn("init")(function* (flags) {
 		path,
 		config,
 		tailnet,
-		footer: [`Add more with fizz config add repos|files|${PACKAGE_MANAGERS.join("|")}|brew|cask.`]
+		footer: [`Add more with fizz config add repos|files|${PACKAGE_MANAGERS.join("|")}|brew|cask|skills.`]
 	}));
 	if (yield* Confirm({
 		message: "Run fizz ship --dry-run now?",
@@ -75347,10 +75600,10 @@ const install = fn("install")(function* (version, why) {
 	if ((yield* runHere("sh", ["-c", installWith(installer, [spec])])) !== 0) return yield* new VersionError({ reason: `could not install ${spec} with ${installer}; run ${MANAGERS[installer].install} ${spec}` });
 });
 const atConfigVersion = (flag, running, effect) => gen(function* () {
-	const fs = yield* FileSystem;
 	const path = flag ?? configPath(process.env);
-	if (!(yield* fs.exists(path))) return yield* effect;
-	const wanted = readVersion(yield* fs.readFileString(path));
+	const text = yield* readConfigText(path);
+	if (text === void 0) return yield* effect;
+	const wanted = readVersion(text);
 	if (wanted === void 0 || wanted === running) return yield* effect;
 	if (process.env[SWITCHED] !== void 0) return yield* new VersionError({ reason: `${homeRelative(path)} needs fleetfizz ${wanted}, but the fizz on PATH is still ${running} after installing it; see which fizz comes first (command -v fizz)` });
 	yield* install(wanted, `${homeRelative(path)} needs fleetfizz ${wanted}, not ${running}`);
@@ -75367,12 +75620,11 @@ const latest = fn("latest")(function* () {
 	return version;
 });
 const selfUpdate = fn("selfUpdate")(function* (input) {
-	const fs = yield* FileSystem;
 	const path = input.config ?? configPath(process.env);
-	if (!(yield* fs.exists(path))) return yield* new VersionError({ reason: `no config at ${homeRelative(path)}; run fizz init to write one, or pass --config` });
+	const text = yield* readConfigText(path);
+	if (text === void 0) return yield* new VersionError({ reason: `no config at ${homeRelative(path)}; run fizz init to write one, or pass --config` });
 	const version = input.version ?? (yield* latest());
 	if (predatesVersion(version)) return yield* new VersionError({ reason: `fleetfizz ${version} cannot read this config, which needs 0.14.0 or newer` });
-	const text = yield* fs.readFileString(path);
 	const named = readVersion(text) === version;
 	if (named && version === input.running) {
 		yield* log(`fleetfizz ${version} already`);
@@ -75475,6 +75727,23 @@ const addCommand = make$4("add").pipe(withDescription("Add an Item or a Machine
 	...PACKAGE_MANAGERS.map(globalCommand),
 	homebrewCommand("brew"),
 	homebrewCommand("cask"),
+	make$4("skills", {
+		name: String$2("name").pipe(withDescription$2("The skill, by the name its source gives it.")),
+		source: String$1("source").pipe(optional, withDescription$1("Where the skills CLI installs it from: `owner/repo` on GitHub, or any source `skills add` takes. Default: the GitHub repo the CLI installed it from here. Asked for when missing.")),
+		ref: String$1("ref").pipe(optional, withDescription$1("A branch, tag, or full commit SHA. Default: the repo's default branch, or without `--source`, the ref the CLI installed it at here.")),
+		agent: String$1("agent").pipe(atLeast(0), withMetavar("id"), withDescription$1("An agent to install it for, as a skills CLI id (`claude-code`). Repeat the flag for more. For the first skill, they are the section's `agents`, picked from this Machine's when missing; after that, the skill's own.")),
+		...targetingFlags
+	}).pipe(withDescription("Add an agent skill."), withHandler((flags) => withConfig((config) => addSkill({
+		config,
+		name: flags.name,
+		source: getOrUndefined$1(flags.source),
+		ref: getOrUndefined$1(flags.ref),
+		agents: flags.agent,
+		targeting: {
+			platforms: flags.platform,
+			machines: flags.machine
+		}
+	})).pipe(printProblems))),
 	make$4("repos", {
 		origin: String$2("origin").pipe(withDescription$2("The GitHub `owner/repo`.")),
 		name: String$1("name").pipe(optional, withDescription$1("The Item's name. Default: the repo's name.")),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetfizz",
-  "version": "0.14.1",
+  "version": "0.15.0",
   "description": "Keep every Machine on your tailnet in line with one config.",
   "keywords": [
     "agent-skills",