@oh-my-pi/pi-utils 18.1.8 → 18.1.10

package/README.md

@@ -4,22 +4,22 @@ Shared utilities for [oh-my-pi](https://github.com/can1357/oh-my-pi) packages. Z
 
 ## Notable modules
 
-| Module | Purpose |
-| --- | --- |
-| `logger` | Centralized logger writing to `~/.omp/logs/` with rotation (TUI-safe — never stdout) |
-| `prompt` | Handlebars-based prompt templating and formatting helpers |
-| `dirs` | Path helpers for omp config directories (`~/.omp`, XDG-aware on Linux) |
-| `stream` | `readStream` / `readLines` helpers over `ReadableStream` |
-| `ptree` / `procmgr` | Process trees, `ChildProcess` wrapper, process lifecycle management |
-| `postmortem` | Cleanup callbacks on exit, signals, and fatal exceptions |
-| `which` | `$which()` binary lookup with caching |
-| `fetch-retry` | `fetch` with retry/backoff policies |
-| `fs-error` | Errno guards (`isEnoent` and friends) |
-| `env` / `worker-host` | Environment plumbing and side-effect-free worker-host entry contract (`workerHostEntry`) |
-| `abortable` / `async` | AbortSignal-aware stream/promise helpers |
-| `math-delimiters` | LaTeX span/block delimiter grammar (offsets only) shared by the TUI and collab-web renderers |
-| `peek-file` | Read the first N bytes of a file with pooled buffers |
-| `frontmatter`, `glob`, `mime`, `temp`, `format`, `color`, `snowflake`, `tab-spacing`, `path-tree`, `sanitize-text` | Smaller single-purpose helpers |
+| Module                                                                                                             | Purpose                                                                                      |
+| ------------------------------------------------------------------------------------------------------------------ | -------------------------------------------------------------------------------------------- |
+| `logger`                                                                                                           | Centralized logger writing to `~/.omp/logs/` with rotation (TUI-safe — never stdout)         |
+| `prompt`                                                                                                           | Handlebars-based prompt templating and formatting helpers                                    |
+| `dirs`                                                                                                             | Path helpers for omp config directories (`~/.omp`, XDG-aware on Linux)                       |
+| `stream`                                                                                                           | `readStream` / `readLines` helpers over `ReadableStream`                                     |
+| `ptree` / `procmgr`                                                                                                | Process trees, `ChildProcess` wrapper, process lifecycle management                          |
+| `postmortem`                                                                                                       | Cleanup callbacks on exit, signals, and fatal exceptions                                     |
+| `which`                                                                                                            | `$which()` binary lookup with caching                                                        |
+| `fetch-retry`                                                                                                      | `fetch` with retry/backoff policies                                                          |
+| `fs-error`                                                                                                         | Errno guards (`isEnoent` and friends)                                                        |
+| `env` / `worker-host`                                                                                              | Environment plumbing and side-effect-free worker-host entry contract (`workerHostEntry`)     |
+| `abortable` / `async`                                                                                              | AbortSignal-aware stream/promise helpers                                                     |
+| `math-delimiters`                                                                                                  | LaTeX span/block delimiter grammar (offsets only) shared by the TUI and collab-web renderers |
+| `peek-file`                                                                                                        | Read the first N bytes of a file with pooled buffers                                         |
+| `frontmatter`, `glob`, `mime`, `temp`, `format`, `color`, `snowflake`, `tab-spacing`, `path-tree`, `sanitize-text` | Smaller single-purpose helpers                                                               |
 
 Import from the root barrel or per-module subpaths (`@oh-my-pi/pi-utils/<module>`).
 

package/dist/types/tls-fetch.d.ts

@@ -16,8 +16,30 @@ export declare class ExtraCaError extends Error {
         cause?: unknown;
     });
 }
+/**
+ * Returns the PEM bytes referenced by `NODE_EXTRA_CA_CERTS`, or `undefined`
+ * when the env var is unset/empty.
+ *
+ * Accepts the same shapes Node accepts plus an inline-PEM escape hatch:
+ * - Inline PEM (`-----BEGIN CERTIFICATE-----...`). Literal `\n` escapes in
+ *   the env value are expanded so callers can ship single-line PEMs through
+ *   shell exports.
+ * - File path. Anything that does not contain a PEM header is treated as a
+ *   path, matching Node's "extensionless filename is still a path" contract.
+ *   `ENOENT` becomes {@link ExtraCaError}; other I/O errors bubble.
+ */
+export declare function resolveExtraCa(): string | undefined;
 /** Test seam: drop the cached PEM so a follow-up call re-reads the env. */
 export declare function __resetExtraCaCache(): void;
+/**
+ * Merge `extraCa` into `init.tls.ca`. When the caller has not supplied a CA
+ * list, the system root store is included alongside the extra bundle —
+ * Bun's `tls.ca` replaces the default trust store, so omitting roots would
+ * break every public host. When the caller already curated a list (e.g.
+ * Anthropic Foundry's mTLS options, which already seed
+ * `tls.rootCertificates`), only the extra CA is appended.
+ */
+export declare function withExtraCaInit(init: RequestInit | undefined, extraCa: string): RequestInit;
 /**
  * Wrap `fetchImpl` so every call honours `NODE_EXTRA_CA_CERTS`. Idempotent:
  * a fetch already wrapped is returned unchanged so repeated composition
@@ -26,12 +48,3 @@ export declare function __resetExtraCaCache(): void;
  * default deployments pay nothing.
  */
 export declare function wrapFetchForExtraCa(fetchImpl: FetchImpl): FetchImpl;
-/**
- * Convenience for options-bag composition (e.g. the stream-entry path in
- * `@oh-my-pi/pi-ai`'s `stream.ts`, which mirrors `withRequestDebugFetch` so
- * the proxy/debug/extra-CA wrappers compose uniformly). No-op when the env
- * var is unset.
- */
-export declare function withExtraCaFetch<T extends {
-    fetch?: FetchImpl;
-} | undefined>(options: T): T;

package/package.json

@@ -1,44 +1,24 @@
 {
-	"type": "module",
 	"name": "@oh-my-pi/pi-utils",
-	"version": "18.1.8",
+	"version": "18.1.10",
 	"description": "Shared utilities for pi packages",
+	"keywords": [
+		"cli",
+		"logging",
+		"streams",
+		"utilities"
+	],
 	"homepage": "https://omp.sh",
-	"author": "Stencil Labs, Inc.",
+	"bugs": {
+		"url": "https://github.com/can1357/oh-my-pi/issues"
+	},
 	"license": "MIT",
+	"author": "Stencil Labs, Inc.",
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/can1357/oh-my-pi.git",
 		"directory": "packages/utils"
 	},
-	"bugs": {
-		"url": "https://github.com/can1357/oh-my-pi/issues"
-	},
-	"keywords": [
-		"utilities",
-		"cli",
-		"logging",
-		"streams"
-	],
-	"main": "./src/index.ts",
-	"types": "./dist/types/index.d.ts",
-	"scripts": {
-		"check": "oxlint . && oxfmt --check --no-error-on-unmatched-pattern 'src/**/*.{ts,tsx}' '{test,bench,examples,scripts}/**/*.ts' '*.ts' && bun run check:types",
-		"check:types": "tsgo -p tsconfig.json --noEmit",
-		"lint": "oxlint .",
-		"test": "bun test --parallel",
-		"fix": "oxlint --fix --fix-suggestions . && bun run fmt",
-		"fmt": "oxfmt --no-error-on-unmatched-pattern 'src/**/*.{ts,tsx}' '{test,bench,examples,scripts}/**/*.ts' '*.ts'"
-	},
-	"dependencies": {
-		"@oh-my-pi/pi-natives": "18.1.8"
-	},
-	"devDependencies": {
-		"@types/bun": "^1.3.14"
-	},
-	"engines": {
-		"bun": ">=1.3.14"
-	},
 	"files": [
 		"src",
 		"README.md",
@@ -47,6 +27,9 @@
 		"THIRD-PARTY-NOTICES.txt",
 		"dist/types"
 	],
+	"type": "module",
+	"main": "./src/index.ts",
+	"types": "./dist/types/index.d.ts",
 	"exports": {
 		".": {
 			"types": "./dist/types/index.d.ts",
@@ -61,5 +44,22 @@
 			"import": "./src/*.ts"
 		},
 		"./*.js": "./src/*.ts"
+	},
+	"scripts": {
+		"check": "oxlint . && oxfmt --check --no-error-on-unmatched-pattern 'src/**/*.{ts,tsx}' '{test,bench,examples,scripts}/**/*.ts' '*.ts' && bun run check:types",
+		"check:types": "tsgo -p tsconfig.json --noEmit",
+		"lint": "oxlint .",
+		"test": "bun test --parallel",
+		"fix": "oxlint --fix --fix-suggestions . && bun run fmt",
+		"fmt": "oxfmt --no-error-on-unmatched-pattern 'src/**/*.{ts,tsx}' '{test,bench,examples,scripts}/**/*.ts' '*.ts'"
+	},
+	"dependencies": {
+		"@oh-my-pi/pi-natives": "18.1.10"
+	},
+	"devDependencies": {
+		"@types/bun": "^1.3.14"
+	},
+	"engines": {
+		"bun": ">=1.3.14"
 	}
 }

package/src/tls-fetch.ts

@@ -76,7 +76,7 @@ let cacheValue: string | undefined;
  *   path, matching Node's "extensionless filename is still a path" contract.
  *   `ENOENT` becomes {@link ExtraCaError}; other I/O errors bubble.
  */
-function resolveExtraCa(): string | undefined {
+export function resolveExtraCa(): string | undefined {
 	const raw = $env.NODE_EXTRA_CA_CERTS?.trim();
 	if (!raw) return undefined;
 
@@ -122,7 +122,7 @@ export function __resetExtraCaCache(): void {
  * Anthropic Foundry's mTLS options, which already seed
  * `tls.rootCertificates`), only the extra CA is appended.
  */
-function withExtraCaInit(init: RequestInit | undefined, extraCa: string): RequestInit {
+export function withExtraCaInit(init: RequestInit | undefined, extraCa: string): RequestInit {
 	const existingTls = (init as BunTlsRequestInit | undefined)?.tls;
 	const existingCa = existingTls?.ca;
 	let mergedCa: string[];
@@ -162,17 +162,3 @@ export function wrapFetchForExtraCa(fetchImpl: FetchImpl): FetchImpl {
 	);
 	return wrapped;
 }
-
-/**
- * Convenience for options-bag composition (e.g. the stream-entry path in
- * `@oh-my-pi/pi-ai`'s `stream.ts`, which mirrors `withRequestDebugFetch` so
- * the proxy/debug/extra-CA wrappers compose uniformly). No-op when the env
- * var is unset.
- */
-export function withExtraCaFetch<T extends { fetch?: FetchImpl } | undefined>(options: T): T {
-	if (!$env.NODE_EXTRA_CA_CERTS?.trim()) return options;
-	const fetchImpl = options?.fetch ?? (globalThis.fetch as FetchImpl);
-	const wrapped = wrapFetchForExtraCa(fetchImpl);
-	if (wrapped === fetchImpl && options?.fetch !== undefined) return options;
-	return { ...options, fetch: wrapped } as T;
-}