fyn 3.0.1 → 3.0.3

package/bin/.temp/sample-input.json

@@ -0,0 +1,63 @@
+{
+  "session_id": "082c1934-9969-4c0e-a095-f8400bd25393",
+  "transcript_path": "/Users/jc/.claude/projects/-Users-jc-dev-fynjs/082c1934-9969-4c0e-a095-f8400bd25393.jsonl",
+  "cwd": "/Users/jc/dev/fynjs/packages/fyn/bin",
+  "prompt_id": "adb5c134-a498-409b-86e1-0869a5c3236f",
+  "effort": {
+    "level": "high"
+  },
+  "session_name": "Fyn visual exec log over clearing",
+  "model": {
+    "id": "claude-opus-5[1m]",
+    "display_name": "Opus 5 (1M context)"
+  },
+  "workspace": {
+    "current_dir": "/Users/jc/dev/fynjs/packages/fyn/bin",
+    "project_dir": "/Users/jc/dev/fynjs",
+    "added_dirs": [],
+    "repo": {
+      "host": "github.com",
+      "owner": "jchip",
+      "name": "fynjs"
+    }
+  },
+  "version": "2.1.239",
+  "output_style": {
+    "name": "default"
+  },
+  "cost": {
+    "total_cost_usd": 10.880410499999998,
+    "total_duration_ms": 1739553,
+    "total_api_duration_ms": 931367,
+    "total_lines_added": 753,
+    "total_lines_removed": 12
+  },
+  "context_window": {
+    "total_input_tokens": 187292,
+    "total_output_tokens": 147,
+    "context_window_size": 1000000,
+    "current_usage": {
+      "input_tokens": 2,
+      "output_tokens": 147,
+      "cache_creation_input_tokens": 812,
+      "cache_read_input_tokens": 186478
+    },
+    "used_percentage": 19,
+    "remaining_percentage": 81
+  },
+  "exceeds_200k_tokens": false,
+  "fast_mode": false,
+  "thinking": {
+    "enabled": true
+  },
+  "rate_limits": {
+    "five_hour": {
+      "used_percentage": 21,
+      "resets_at": 1788241200
+    },
+    "seven_day": {
+      "used_percentage": 51,
+      "resets_at": 1788692400
+    }
+  }
+}

package/dist/fyn.mjs

@@ -2073,7 +2073,7 @@ var dist_default = AveAzul;
 var aveazul_default = dist_default;
 
 //#endregion
-//#region node_modules/.f/_/signal-exit/3.0.7/signal-exit/signals.js
+//#region node_modules/.f/_/signal-exit/3.0.7/node_modules/signal-exit/signals.js
 var require_signals$3 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = [
 		"SIGABRT",
@@ -2087,7 +2087,7 @@ var require_signals$3 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 }));
 
 //#endregion
-//#region node_modules/.f/_/signal-exit/3.0.7/signal-exit/index.js
+//#region node_modules/.f/_/signal-exit/3.0.7/node_modules/signal-exit/index.js
 var require_signal_exit = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	var process = global.process;
 	const processOk = function(process) {
@@ -7622,13 +7622,13 @@ cliCursor.toggle = (force, writableStream) => {
 };
 
 //#endregion
-//#region node_modules/.f/_/ansi-regex/6.3.0/ansi-regex/index.js
+//#region node_modules/.f/_/ansi-regex/6.3.0/node_modules/ansi-regex/index.js
 function ansiRegex$1({ onlyFirst = false } = {}) {
 	return new RegExp(`(?:\\u001B\\][^\\u0007\\u001B\\u009C]*(?:\\u0007|\\u001B\\u005C|\\u009C))|[\\u001B\\u009B][[\\]()#;?]*(?:\\d{1,4}(?:[;:]\\d{0,4})*)?[\\dA-PR-TZcf-nq-uy=><~]`, onlyFirst ? void 0 : "g");
 }
 
 //#endregion
-//#region node_modules/.f/_/strip-ansi/7.2.0/strip-ansi/index.js
+//#region node_modules/.f/_/strip-ansi/7.2.0/node_modules/strip-ansi/index.js
 const regex$2 = ansiRegex$1();
 function stripAnsi$1(string) {
 	if (typeof string !== "string") throw new TypeError(`Expected a \`string\`, got \`${typeof string}\``);
@@ -10019,6 +10019,7 @@ var VisualLogger = class VisualLogger {
 		this._renderInterval = Math.floor(1e3 / options.renderFps + .5);
 		this._spinTimers = {};
 		this._renderTimer = null;
+		this._rendered = false;
 		this._colorPrefix = {};
 		this._defaultPrefix = "";
 		this._chalkLevel = 0;
@@ -10074,9 +10075,23 @@ var VisualLogger = class VisualLogger {
 		return this;
 	}
 	setItemType(flag) {
-		if (!flag) this._itemType = LogItemTypes.none;
-		else this._itemType = LogItemTypes[flag] || LogItemTypes.none;
-		if (this._itemType === LogItemTypes.normal && !this._output.isTTY()) this._itemType = LogItemTypes.simple;
+		let itemType;
+		if (!flag) itemType = LogItemTypes.none;
+		else itemType = LogItemTypes[flag] || LogItemTypes.none;
+		if (itemType === LogItemTypes.normal && !this._output.isTTY()) itemType = LogItemTypes.simple;
+		if (itemType !== this._itemType) {
+			const wasVisual = this._shouldLogItem();
+			if (wasVisual) {
+				this.clearItems();
+				this._getItemKeys().forEach((k) => {
+					this._stopItemSpinner(this._itemOptions[k]);
+				});
+			}
+			this._itemType = itemType;
+			if (!wasVisual && this._shouldLogItem()) this._getItemKeys().forEach((k) => {
+				this._startItemSpinner(this._itemOptions[k]);
+			});
+		}
 		if (this._itemType === LogItemTypes.simple) this._dots = 0;
 		return this;
 	}
@@ -10165,15 +10180,24 @@ var VisualLogger = class VisualLogger {
 		return this;
 	}
 	clearItems() {
-		if (this._shouldLogItem() && this._lines.length > 0) this._output.visual.clear();
-		else this._checkSimpleDots();
+		if (this._shouldLogItem()) {
+			this._cancelRender();
+			if (this._rendered) {
+				this._output.visual.clear();
+				this._rendered = false;
+			}
+		} else this._checkSimpleDots();
 		return this;
 	}
 	freezeItems(showItems) {
 		this._getItemKeys().forEach((k) => {
 			this._stopItemSpinner(this._itemOptions[k]);
 		});
-		this._output.visual.clear();
+		this._cancelRender();
+		if (this._rendered) {
+			this._output.visual.clear();
+			this._rendered = false;
+		}
 		this._resetSimpleDots();
 		if (showItems) this._output.write(`${this._lines.join("\n")}\n`);
 		this._backupItemType = this._itemType;
@@ -10190,7 +10214,7 @@ var VisualLogger = class VisualLogger {
 	}
 	shutdown(showItems) {
 		this.freezeItems(showItems);
-		if (this._renderTimer) clearTimeout(this._renderTimer);
+		this._cancelRender();
 	}
 	_checkSimpleDots() {
 		if (this._itemType === LogItemTypes.simple && this._dots >= this._maxDots) {
@@ -10270,11 +10294,19 @@ var VisualLogger = class VisualLogger {
 		this._stopSpinTimer(options);
 		return this;
 	}
+	_cancelRender() {
+		if (this._renderTimer) {
+			clearTimeout(this._renderTimer);
+			this._renderTimer = null;
+		}
+	}
 	_renderOutput() {
 		if (!this._renderTimer && this._shouldLogItem() && this._lines.length > 0) {
 			this._renderTimer = setTimeout(() => {
 				this._renderTimer = null;
+				if (!this._shouldLogItem() || this._lines.length === 0) return;
 				this._output.visual.write(this._lines.join("\n"));
+				this._rendered = true;
 			}, this._renderInterval);
 			this._renderTimer.unref();
 		}
@@ -10321,7 +10353,9 @@ var VisualLogger = class VisualLogger {
 		return this;
 	}
 	_shouldLogItem() {
-		return this._itemType === LogItemTypes.normal && this._logLevel <= VisualLogger.Levels.info;
+		const { isTTY } = this._output;
+		const tty = typeof isTTY === "function" ? Boolean(isTTY.call(this._output)) : true;
+		return this._itemType === LogItemTypes.normal && this._logLevel <= VisualLogger.Levels.info && tty;
 	}
 };
 
@@ -14033,6 +14067,7 @@ var FynpoDepGraph = class {
 	* @returns boolean - whether dep is added (it's not if it already exist)
 	*/
 	addDep(pkgInfo, depPkg, depSection, indirectSteps) {
+		if (pkgInfo.path === depPkg.path) return false;
 		const dataPkg = this.depMapByPath[pkgInfo.path];
 		const dataDep = this.depMapByPath[depPkg.path];
 		if (dataPkg.localDepsByPath[depPkg.path]) return false;
@@ -15315,6 +15350,7 @@ var PkgDepResolver = class {
 					if (fynpoPkg) {
 						const steps = revSteps.reverse();
 						locals.forEach((x) => {
+							if (fynpoPkg.path === x.path) return;
 							const sec = getDepSection(depSec);
 							if (fynpo.graph.addDep(fynpoPkg, x, sec, steps)) fynpo.indirects.push({
 								fromPkg: import_lodash_min.default.pick(fynpoPkg, [
@@ -27747,7 +27783,7 @@ var require_index_min$1 = /* @__PURE__ */ __commonJSMin(((exports) => {
 }));
 
 //#endregion
-//#region node_modules/.f/_/which/7.0.0/which/lib/index.js
+//#region node_modules/.f/_/which/7.0.0/node_modules/which/lib/index.js
 var require_lib$33 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const { isexe, sync: isexeSync } = require_index_min$1();
 	const { join: join$10, delimiter: delimiter$2, sep: sep$9, posix: posix$1 } = __require("path");
@@ -31591,7 +31627,7 @@ var require_minipass_collect = /* @__PURE__ */ __commonJSMin(((exports, module)
 }));
 
 //#endregion
-//#region node_modules/.f/_/minipass/3.3.6/minipass/index.js
+//#region node_modules/.f/_/minipass/3.3.6/node_modules/minipass/index.js
 var require_minipass = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const proc = typeof process === "object" && process ? process : {
 		stdout: null,
@@ -83945,7 +83981,7 @@ var require_chmod = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 }));
 
 //#endregion
-//#region node_modules/.f/_/isexe/2.0.0/isexe/windows.js
+//#region node_modules/.f/_/isexe/2.0.0/node_modules/isexe/windows.js
 var require_windows = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = isexe;
 	isexe.sync = sync;
@@ -83976,7 +84012,7 @@ var require_windows = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 }));
 
 //#endregion
-//#region node_modules/.f/_/isexe/2.0.0/isexe/mode.js
+//#region node_modules/.f/_/isexe/2.0.0/node_modules/isexe/mode.js
 var require_mode = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = isexe;
 	isexe.sync = sync;
@@ -84007,7 +84043,7 @@ var require_mode = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 }));
 
 //#endregion
-//#region node_modules/.f/_/isexe/2.0.0/isexe/index.js
+//#region node_modules/.f/_/isexe/2.0.0/node_modules/isexe/index.js
 var require_isexe = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	__require("fs");
 	var core;
@@ -84422,7 +84458,7 @@ var require_mimic_fn = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 }));
 
 //#endregion
-//#region node_modules/.f/_/onetime/5.1.2/onetime/index.js
+//#region node_modules/.f/_/onetime/5.1.2/node_modules/onetime/index.js
 var require_onetime = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const mimicFn = require_mimic_fn();
 	const calledFunctions = /* @__PURE__ */ new WeakMap();
@@ -87582,6 +87618,43 @@ function enhanceError(err, context) {
 	err.stderr = context.stderr.length > MAX_OUTPUT_IN_ERROR ? context.stderr.slice(-5e4) : context.stderr;
 	return err;
 }
+const ESCAPE_SEQUENCE = /* @__PURE__ */ new RegExp("\x1B(?:\\[[0-?]*[ -/]*[@-~]|[\\]P^_X][\\s\\S]*?(?:\\u0007|\x1B\\\\|$)|[ -/]+[0-~]|[0-~])", "g");
+const SGR_SEQUENCE = /* @__PURE__ */ new RegExp("^\x1B\\[[0-?]*[ -/]*m$");
+const HAS_SGR = /* @__PURE__ */ new RegExp("\x1B\\[[0-?]*[ -/]*m");
+const SGR_RESET = "\x1B[0m";
+const C1_SEQUENCE = /[\u009B][0-?]*[ -/]*[@-~]|[\u009D\u0090\u009E\u009F][\s\S]*?(?:\u0007|\u009C|$)/g;
+const C1_CONTROL = /[\u0080-\u009F]/g;
+const UNSAFE_CONTROL = /[\u0000-\u0008\u000B-\u001A\u001C-\u001F\u007F]/g;
+/**
+* Strip terminal control sequences from child output, keeping colour. Never use this for
+* output written to a file or handed to a callback - those should get the bytes untouched.
+*/
+function sanitizeText(text, options = {}) {
+	const { tabs = "space", cr = "drop", resetAtEnd = false } = options;
+	let out = text.replace(ESCAPE_SEQUENCE, (seq) => SGR_SEQUENCE.test(seq) ? seq : "");
+	if (cr === "newline") out = out.replace(/\r\n?/g, "\n");
+	out = out.replace(/\t/g, tabs === "keep" ? "	" : " ").replace(C1_SEQUENCE, "").replace(C1_CONTROL, "").replace(UNSAFE_CONTROL, "");
+	return resetAtEnd && HAS_SGR.test(out) ? out + SGR_RESET : out;
+}
+/** Profile for text squeezed into a single progress line. */
+function sanitizeForDisplay(text) {
+	return sanitizeText(text, {
+		tabs: "space",
+		cr: "drop"
+	});
+}
+/**
+* Profile for a multi-line transcript written into scrollback: tabs are real formatting,
+* carriage returns become line breaks so progress redraws stay readable, and a trailing
+* reset stops an unterminated child colour bleeding into later output.
+*/
+function sanitizeForOutput(text) {
+	return sanitizeText(text, {
+		tabs: "keep",
+		cr: "newline",
+		resetAtEnd: true
+	});
+}
 var VisualExec = class {
 	constructor(options) {
 		this._aborted = false;
@@ -87650,7 +87723,7 @@ var VisualExec = class {
 		if (progress) this._onProgress(progress);
 	}
 	_updateDigest(item, buf) {
-		const lines = (item.buf + buf).split("\n").map((x) => x && x.trim()).filter((x) => x);
+		const lines = (item.buf + sanitizeForDisplay(buf)).split("\n").map((x) => x && x.trim()).filter((x) => x);
 		const stripLines = lines.map((x) => hasAnsi(x) ? stripAnsi$1(x) : x);
 		let length = 0;
 		let ix = stripLines.length - 1;
@@ -87842,7 +87915,7 @@ var VisualExec = class {
 			this._logger[level](`${chalk.green("No output")} from ${this._outputLabel}`);
 			return;
 		}
-		const colorize = (t) => t.replace(/ERR!/g, chalk.red("ERR!"));
+		const colorize = (t) => sanitizeForOutput(t).replace(/ERR!/g, chalk.red("ERR!"));
 		const logs = [chalk.green(">>>"), `Start of output from ${this._outputLabel} ===`];
 		if (output.stdout) logs.push(`\n${colorize(output.stdout)}`);
 		if (output.stderr) logs.push(chalk.red("\n=== stderr ===\n") + colorize(output.stderr));
@@ -98877,7 +98950,7 @@ const showAudit = (fyn, opts) => {
 };
 
 //#endregion
-//#region node_modules/.f/_/ini/4.1.1/ini/lib/ini.js
+//#region node_modules/.f/_/ini/4.1.1/node_modules/ini/lib/ini.js
 var require_ini = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const { hasOwnProperty } = Object.prototype;
 	const encode = (obj, opt = {}) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fyn",
-  "version": "3.0.1",
+  "version": "3.0.3",
   "description": "fyn is the NPM for fynpo -- a zero setup monorepo tool",
   "main": "./bin/fyn.js",
   "homepage": "https://github.com/jchip/fynjs/tree/main/packages/fyn",