@codedealer/pi-sync 1.0.0 → 1.1.0

package/README.md

@@ -81,7 +81,7 @@ Resources use per-type roots, and every source and target must stay inside its d
 | `agent` | `resources/agents/NAME.md` | `agents/NAME.md` | single `.md` file |
 | `role` | `resources/roles/NAME.md` | `roles/NAME.md` | single `.md` file |
 
-For non-skill types the source and target must use the same name. Symbolic links are rejected, paths use relative POSIX syntax, and no path may traverse outside its root. `node_modules` directories are never imported or managed; only authored content and portable extension configuration belong in the setup repository. Package-installed code is never imported. The optional schema-v1 `settings` list supports explicitly selected JSON Pointer fields in `settings.json`, `models.json`, `keybindings.json`, or `mcp.json`; each entry has a `target` and `fields` array of `{ "path": "/nested/key", "value": ... }`. Keep paths narrow and never declare credentials or machine-local values; Pi Sync rejects credential-like field names as a defense-in-depth check. This is not a general secret scanner. Unselected keys and values are preserved. A pre-existing selected setting that differs from its declared value is reported as a collision on first apply rather than overwritten. Unsupported schema fields, resource types, malformed dependency declarations, and lockfile package entries that do not exactly match manifest dependencies are rejected before the local installation is changed.
+For non-skill types the source and target must use the same name. Symbolic links are rejected, paths use relative POSIX syntax, and no path may traverse outside its root. `node_modules` directories are never imported or managed; only authored content and portable extension configuration belong in the setup repository. Package-installed code is never imported. The optional schema-v1 `settings` list supports explicitly selected JSON Pointer fields in `settings.json`, `models.json`, `keybindings.json`, or `mcp.json`; each entry has a `target` and `fields` array of `{ "path": "/nested/key", "value": ... }`. Keep paths narrow and never declare literal credentials or machine-local values; Pi Sync rejects credential-like field names in managed setting values as a defense-in-depth check, with one exception: a credential-like key may hold a strict `$NAME` or `${NAME}` environment reference (which Pi interpolates at request time), so the reference is synced while the actual value stays configured per machine. This is not a general secret scanner. Unselected keys and values are preserved. A pre-existing selected setting that differs from its declared value is reported as a collision on first apply rather than overwritten. Unsupported schema fields, resource types, malformed dependency declarations, and lockfile package entries that do not exactly match manifest dependencies are rejected before the local installation is changed.
 
 Apply stores its last-applied content baseline and recoverable backups under `<agent-dir>/.pi-sync/`, outside the setup repository. The baseline enables file-level three-way resource reconciliation and per-field settings reconciliation: repository-only changes are applied independently, local-only changes are preserved and reported as `local-divergence`, and overlapping changes are reported as conflicts without overwriting the conflicted item. Non-conflicting files and settings fields can still be reconciled in the same apply. Apply operations are serialized with a local lock; if a lock's owner process has exited, apply fails closed and asks the user to remove `.pi-sync/apply.lock` only after confirming that no apply process is running. Local state and backups are not part of the setup repository.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codedealer/pi-sync",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "A manifest-driven CLI for applying explicitly managed Pi resources.",
   "type": "module",
   "bin": {

package/src/cli.js

@@ -203,14 +203,28 @@ async function findLikelySecrets(root, relative) {
   return findings;
 }
 
+const ENV_REFERENCE = /^\$[A-Za-z_][A-Za-z0-9_]*$|^\$\{[A-Za-z_][A-Za-z0-9_]*\}$/;
+// LLM usage/limit parameters that contain "token" but never carry credentials.
+const NON_CREDENTIAL_TOKEN_KEYS = new Set(['tokens', 'maxtokens', 'mintokens', 'tokencount', 'tokenlimit', 'numtokens']);
+
+function isCredentialLikeKey(normalized) {
+  if (['apikey', 'password', 'passwd', 'secret', 'credential', 'privatekey'].some((part) => normalized.includes(part))) return true;
+  if (normalized.includes('token')) return !NON_CREDENTIAL_TOKEN_KEYS.has(normalized);
+  if (normalized.includes('auth')) return !normalized.startsWith('author');
+  return false;
+}
+
 function validatePortableSettingValue(value, label) {
   if (Array.isArray(value)) {
     value.forEach((item, index) => validatePortableSettingValue(item, `${label}[${index}]`));
   } else if (isRecord(value)) {
     for (const [key, nested] of Object.entries(value)) {
       const normalized = key.toLowerCase().replace(/[^a-z0-9]/g, '');
-      if (/(?:apikey|token|password|secret|credential|auth)/.test(normalized)) {
-        throw new Error(`${label} contains a credential-like key (${key})`);
+      if (isCredentialLikeKey(normalized)) {
+        if (typeof nested !== 'string' || !ENV_REFERENCE.test(nested)) {
+          throw new Error(`${label} contains a credential-like key (${key}); only a $NAME or ${'$'}{NAME} environment reference may be managed`);
+        }
+        continue;
       }
       validatePortableSettingValue(nested, `${label}.${key}`);
     }
@@ -303,7 +317,7 @@ async function validateRepository(repo, { allowMissingPins = false } = {}) {
       const segments = decodePointer(field.path, `${fieldLabel}.path`);
       validatePortableSettingValue(field.value, `${fieldLabel}.value`);
       for (const segment of segments) {
-        if (/(?:apikey|token|password|secret|credential|auth)/.test(segment.toLowerCase().replace(/[^a-z0-9]/g, ''))) {
+        if (isCredentialLikeKey(segment.toLowerCase().replace(/[^a-z0-9]/g, ''))) {
           throw new Error(`${fieldLabel}.path contains a credential-like key`);
         }
       }