sshlg-skills 1.63.0 → 1.63.2

package/CHANGELOG.md

@@ -1,3 +1,33 @@
+## v1.63.2 — the Claude transaction keeps settings in Claude Code's format
+
+- Replacing a marketplace source in `~/.claude/settings.json` wrote the new object on one
+  line inside a 2-space file. The same `update` then refused to wire hooks ("not in the
+  2-space JSON format Claude Code writes"). A replaced object or array now keeps the
+  layout of its line: pretty inside a multi-line object, compact inside a single-line one.
+  Inserting a source — no marketplace map yet, an empty map, a new member or an empty
+  member entry — writes the missing branch in the file's own layout too.
+- Found by the 1.63.1 installed update on a real profile: the native transaction verified
+  its three members, then hook wiring degraded. Running `update` again with 1.63.2
+  rewrites those sources in the file's own layout and wires hooks.
+
+## v1.63.1 — Claude update works on hosts with live sessions
+
+- `update` no longer refuses a Claude member whose installed payload already equals its
+  pin. Such a member (same version, a docs-only newer source commit, or extra
+  project/local scopes) is reported as payload-equivalent and left installed: no
+  uninstall or reinstall rewrites a payload directory that running sessions are using.
+  Members with different bytes keep the repair/update contract and its refusals.
+- Python bytecode caches (`__pycache__/*.pyc`) written beside hook scripts are runtime
+  artifacts, not payload; payload readback ignores them and still refuses any other
+  file in such a directory.
+- Known limits (B-191, B-192): a payload-equivalent member keeps its upstream marketplace
+  source, so a later native update follows upstream rather than the pin; and a member
+  installed in several scopes still blocks the Claude update once its version changes.
+  A `.pyc` is ignored only beside its pinned `.py`, and bytecode stays outside readback.
+- Found by the installed readback of 1.63.0 on a real profile: 1.63.0's preview
+  refused on agent-sync's bytecode cache, then on members installed in more than one
+  scope. No settings or payload were changed by those refused previews.
+
 ## v1.63.0 — native update safety and managed instruction previews
 
 - Claude Code installation now uses exact member commits through its native plugin

package/bin/sshlg-skills.js

@@ -407,7 +407,8 @@ function withClaudePlan(steps, f) {
     steps.unshift(opres.step('claude-pins', 'home',
       'native immutable source transaction; protected catalogs/settings, scoped repair, rollback on failure, payload readback',
       { fingerprint: native.fingerprint, profile: native.profile,
-        members: native.jobs.map(j => `${j.pluginInstall}: ${j.action} @ ${j.row.commit}; ${j.row.files.length} files`),
+        members: native.jobs.map(j => `${j.pluginInstall}: ${j.action} @ ${j.row.commit}; ${j.row.files.length} files`)
+          .concat(native.equivalent.map(e => `${e.pluginInstall}: payload-equivalent, left installed (installed ${String(e.installed).slice(0, 7)}, pin ${e.pin.slice(0, 7)}; ${e.files} files equal)`)),
         journal: path.join(native.transactionRoot, 'latest.json') }));
   }
   const result = attachWaitPlan(steps, f);
@@ -420,6 +421,16 @@ function runClaudePlan(planned, f) {
     log(`\n== Updating Claude Code plugins ==\n  skipped: ${claudeScope(f).skippedBy} (the Claude host is outside this run's scope)`);
     return true;
   }
+  for (const e of saved.native.equivalent) log(`    ${e.member || e.name}: payload equals pin ${e.pin.slice(0, 7)} (${e.files} files); installed source ${String(e.installed).slice(0, 7)} kept and its marketplace source is unchanged, so a later native update follows that source, not the pin`);
+  if (!saved.native.jobs.length) {
+    // Nothing is written; still describe the state at apply time, not at preview.
+    let again;
+    try { again = require('../lib/claude-pinned').prepare(SKILLS, saved.inventory, { home: os.homedir(), profileRoot: claudeRoot() }); }
+    catch (e) { log(`  Claude native transaction refused before execution: ${e.message}`); return false; }
+    if (again.fingerprint !== saved.native.fingerprint) { log('  Claude native state changed since the preview; run update again'); return false; }
+    log('  Claude native transaction: not needed — every member already carries its pinned payload');
+    return true;
+  }
   // Admission, version check and all backups happen before any other channel.
   let result;
   try { result = require('../lib/claude-pin-transaction').execute(saved.native, SKILLS, saved.inventory); }

package/lib/claude-pinned.js

@@ -34,7 +34,8 @@ function editAt(text,keys,value) {
   const parsed=J.parse(text);let node=parsed.root;
   for(let i=0;i<keys.length-1;i++) {
     let entry=node.props && node.props.find(p=>p.key===keys[i]);
-    if(!entry) return editAt(J.edit(text,node,keys[i],{}),keys,value);
+    // Insert the whole missing branch in one edit so it takes the file's layout.
+    if(!entry) return J.edit(text,node,keys[i],keys.slice(i+1).reduceRight((v,k)=>({[k]:v}),value));
     if(!entry.value.props) throw Error('native Claude settings field is not an object');
     node=entry.value;
   }
@@ -61,13 +62,24 @@ function prepare(members,inventory,opts) {
   const transactionRoot=path.join(home,'.sshlg-skills/claude-pinned',Source.sha256(profile).slice(0,16),'transactions');
   const active=read(path.join(transactionRoot,'latest.json'),'null').data;
   if(fs.existsSync(path.join(transactionRoot,'lock')) || (active && (active.status==='running' || active.status==='failed' && (!active.settingsRestored || active.uncertain)))) throw Error('incomplete Claude transaction; inspect '+path.join(transactionRoot,'latest.json'));
-  const jobs=[];
+  const jobs=[],equivalent=[];
   for(const row of rows) {
     const marketplace=row.pluginInstall.split('@')[1],dir=path.join(home,'.sshlg-skills/claude-pinned',Source.sha256(profile).slice(0,16),marketplace);
     const declaration=settings.data.extraKnownMarketplaces?.[marketplace];
     if(declaration && (!plain(declaration) || !ownedSource(declaration.source,row,dir))) throw Error(row.name+': conflicting marketplace declaration');
     if(known.data[marketplace] && !ownedSource(known.data[marketplace].source,row,dir)) throw Error(row.name+': conflicting known marketplace source');
     const existing=registry.data.plugins[row.pluginInstall];
+    // Same version, pinned bytes already installed: nothing to deliver. A different
+    // (docs-only) source commit or extra project/local scopes need no native mutation,
+    // and a reinstall would rewrite a payload directory live sessions are using.
+    const user=Array.isArray(existing)?existing.filter(r=>r&&r.scope==='user'):[];
+    if(user.length===1 && user[0].version===row.version && typeof user[0].installPath==='string'
+        && !(existing.length===1 && user[0].gitCommitSha===row.commit)
+        && Bindings.profilePath(user[0].installPath).startsWith(path.join(profile,'plugins/cache')+path.sep)
+        && existing.every(r=>r && r.installPath===user[0].installPath && r.version===row.version)) {
+      let equal=false;try {equal=Source.verifyPayload(user[0].installPath,row)>=1;}catch(_) {}
+      if(equal) {equivalent.push({name:row.name,pluginInstall:row.pluginInstall,version:row.version,pin:row.commit,installed:user[0].gitCommitSha||null,scopes:existing.length,files:row.files.length});continue;}
+    }
     if(existing!==undefined && (!Array.isArray(existing) || existing.length!==1 || existing[0]?.scope!=='user')) throw Error(row.name+': native immutable repair supports one user-scope install only');
     for(const id of Object.keys(registry.data.plugins)) if(id.endsWith('@'+marketplace) && id!==row.pluginInstall) throw Error(row.name+': marketplace has another installed plugin');
     let action='install',old=null,oldFiles=null,repairEligible=false;
@@ -81,7 +93,7 @@ function prepare(members,inventory,opts) {
       if(!manifest.exists || manifest.data?.name!==row.pluginInstall.split('@')[0]) throw Error(row.name+': unknown installed manifest');
       let exact=false;try {exact=old.version===row.version && old.gitCommitSha===row.commit && Source.verifyPayload(old.installPath,row)>=1;}catch(_) {}
       action=exact?'verify':old.version===row.version?'reinstall':'update';
-      oldFiles=Source.snapshotPayload(old.installPath);
+      oldFiles=Source.snapshotPayload(old.installPath,'present');
       if(action==='reinstall' && !/^[a-f0-9]{40}$/.test(old.gitCommitSha||'')) throw Error(row.name+': repair requires prior immutable Git identity');
       if(action==='reinstall' && (oldFiles.length!==row.files.length || oldFiles.some(f=>!row.files.some(p=>p.path===f.path)))) throw Error(row.name+': unknown same-version payload files; preserve before repair');
       repairEligible=!(row.configSurface || configured(manifest.data) || oldFiles.some(f=>/\.(mcpb|dxt)$/i.test(f.path)) || Object.prototype.hasOwnProperty.call(settings.data.pluginConfigs||{},row.pluginInstall));
@@ -98,7 +110,7 @@ function prepare(members,inventory,opts) {
     }
     jobs.push({name:row.name,pluginInstall:row.pluginInstall,marketplace,dir,file,catalog,action,row,old,oldFiles,repairEligible});
   }
-  const fingerprint=Source.sha256(JSON.stringify({settings:settings.text,registry:registry.text,known:known.text,catalogs:jobs.map(j=>({text:read(j.file,'null').text,action:j.action,oldFiles:j.oldFiles})),inventory:rows,profile,home,bindings:[settingsFile,registryFile,knownFile,...jobs.map(j=>j.file)].map(Bindings.profilePath)}));
-  return {fingerprint,requested,profile,home,settingsFile,registryFile,knownFile,settings,registry,known,jobs,transactionRoot};
+  const fingerprint=Source.sha256(JSON.stringify({equivalent,settings:settings.text,registry:registry.text,known:known.text,catalogs:jobs.map(j=>({text:read(j.file,'null').text,action:j.action,oldFiles:j.oldFiles})),inventory:rows,profile,home,bindings:[settingsFile,registryFile,knownFile,...jobs.map(j=>j.file)].map(Bindings.profilePath)}));
+  return {fingerprint,requested,profile,home,settingsFile,registryFile,knownFile,settings,registry,known,jobs,equivalent,transactionRoot};
 }
 module.exports={prepare,editAt,ownedSource,configured,parseMetadata};

package/lib/claude-plugin-source.js

@@ -73,7 +73,13 @@ function catalog(row) {
   return {name:row.pluginInstall.split('@')[1],owner:{name:'ssheleg'},plugins:[{
     ...row.entry,name:row.pluginInstall.split('@')[0],source:{source:'git-subdir',url:'https://github.com/'+row.repo+'.git',path:row.pluginPath,sha:row.commit}}]};
 }
-function snapshotPayload(root) {
+function snapshotPayload(root,pinned) {
+  // `pinned`: the set of pinned paths. A bytecode cache is ignored only for a .pyc whose
+  // source sits pinned beside it; it stays outside this readback either way.
+  // `pinned === 'present'`: an installed payload being replaced, where a .pyc may
+  // belong to its own (old) .py rather than to the new pin.
+  const hasSource=pinned==='present'?rel=>{try {return fs.lstatSync(path.join(root,rel)).isFile();} catch(_) {return false;}}
+    :(s=>rel=>s.has(rel))(pinned instanceof Set?pinned:new Set());
   const files=[];
   function walk(dir,rel='') {
     for(const e of fs.readdirSync(dir,{withFileTypes:true})) {
@@ -82,6 +88,15 @@ function snapshotPayload(root) {
         if(!e.isDirectory() || fs.readdirSync(full,{withFileTypes:true}).some(x=>!x.isFile() || !/^[0-9]+$/.test(x.name))) throw Error('unexpected native lease-marker shape');
         continue;
       }
+      // Python writes bytecode caches beside scripts that hooks run; they are
+      // regenerated runtime artifacts, never pinned payload. Anything else there refuses.
+      if(e.name==='__pycache__' && e.isDirectory()) {
+        for(const x of fs.readdirSync(full,{withFileTypes:true})) {
+          const m=/^([^.]+)\.[A-Za-z0-9_-]+(?:\.opt-\d+)?\.pyc$/.exec(x.name);
+          if(!x.isFile() || !m || !hasSource((rel?rel+'/':'')+m[1]+'.py')) throw Error('unexpected bytecode-cache shape: '+name+'/'+x.name);
+        }
+        continue;
+      }
       if(e.isDirectory()) walk(full,name);
       else if(e.isFile()) files.push(name);
       else throw Error('non-regular installed plugin payload');
@@ -92,7 +107,7 @@ function snapshotPayload(root) {
   return files.sort().map(file=>{const b=fs.readFileSync(path.join(root,file));return {path:file,sha256:sha256(b),bytes:b.length};});
 }
 function verifyPayload(root,row) {
-  const actual=snapshotPayload(root),expected=new Map(row.files.map(f=>[f.path,f]));
+  const expected=new Map(row.files.map(f=>[f.path,f])),actual=snapshotPayload(root,new Set(expected.keys()));
   if(actual.length!==expected.size || actual.some(f=>!expected.has(f.path))) throw Error('installed plugin file inventory differs from pin');
   for(const f of actual) {const e=expected.get(f.path);if(f.bytes!==e.bytes || f.sha256!==e.sha256) throw Error('installed plugin bytes differ from pin: '+f.path);}
   return actual.length;

package/lib/json-spans.js

@@ -53,7 +53,18 @@ function edit(text, object, key, value) {
   if (!object || !object.props) throw new Error('target is not an object');
   const ps = object.props, index = ps.findIndex(p => p.key === key), p = ps[index];
   const splice = (start, end, insert = '') => text.slice(0, start) + insert + text.slice(end);
-  if (p && value !== undefined) return splice(p.value.start, p.value.end, JSON.stringify(value));
+  if (p && value !== undefined) {
+    // A replaced object or array keeps the layout of its line: pretty in a multi-line
+    // object (the format Claude Code itself writes), compact in a single-line one.
+    const nl = text.includes('\r\n') ? '\r\n' : '\n';
+    const lineStart = text.lastIndexOf('\n', p.start - 1) + 1;
+    const lead = text.slice(lineStart, p.start);
+    const multiline = /[\r\n]/.test(text.slice(object.start + 1, ps[0].start)) && /^[ \t]*$/.test(lead);
+    const unit = lead.includes('\t') ? '\t' : 2;
+    const encoded = multiline && value !== null && typeof value === 'object'
+      ? JSON.stringify(value, null, unit).replace(/\n/g, nl + lead) : JSON.stringify(value);
+    return splice(p.value.start, p.value.end, encoded);
+  }
   if (p) {
     if (ps.length === 1) {
       // Insertion into an empty object precedes its original whitespace.
@@ -72,7 +83,17 @@ function edit(text, object, key, value) {
   const encoded = multiline ? JSON.stringify(value, null, 2).replace(/\n/g, newline + indent) : JSON.stringify(value);
   const member = JSON.stringify(key) + colon + encoded;
   if (ps.length) return splice(ps[ps.length - 1].end, ps[ps.length - 1].end, ',' + (multiline ? newline + indent : '') + member);
-  // Empty object has no foreign property bytes to alter. Keep its existing gap.
+  // Empty object has no foreign property bytes to alter. In a multi-line document an
+  // empty `{}` that starts its own line opens onto lines of its own, one level deeper,
+  // which is the layout Claude Code writes; otherwise its existing gap is kept.
+  const lineStart = text.lastIndexOf('\n', object.start - 1) + 1;
+  const before = text.slice(lineStart, object.start);
+  const opens = /\n/.test(text) && text.slice(object.start, object.end) === '{}' && /^[ \t]*(?:"(?:[^"\\]|\\.)*"[ \t]*:[ \t]*)?$/.test(before);
+  if (opens) {
+    const base = before.match(/^[ \t]*/)[0], step = base.includes('\t') ? '\t' : '  ', inner = base + step;
+    const pretty = JSON.stringify(key) + ': ' + JSON.stringify(value, null, step === '\t' ? '\t' : 2).replace(/\n/g, newline + inner);
+    return splice(object.start + 1, object.start + 1, newline + inner + pretty + newline + base);
+  }
   return splice(object.start + 1, object.start + 1, member);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sshlg-skills",
-  "version": "1.63.0",
+  "version": "1.63.2",
   "skillsCli": "skills@1.7.2",
   "description": "The ssheleg harness skill layer: routing, delivery gates, specialist skills and durable handoffs for coding agents.",
   "bin": {