@rockysoft/opencode-hybrid-workflow 1.1.2 → 1.3.0

package/lib/install.mjs

@@ -50,7 +50,7 @@ function configPath(root,name) {
   if(existsSync(plain)&&existsSync(comments))throw Error(`Both ${name}.json and ${name}.jsonc exist. Resolve ambiguity before installation.`);
   return existsSync(comments)?comments:plain;
 }
-export function install({root=configDirectory(),source=packageRoot,settingsPatch={},replaceLegacyPackage,apply=true,registerPlugin=true}={}) {
+export function install({root=configDirectory(),source=packageRoot,settingsPatch={},replaceLegacyPackage,apply=true,registerPlugin=true,assetsOnly=false}={}) {
   root=path.resolve(root);source=realpathSync(source);
   const edits=[],conflicts=[];
   const read=(file,fallback={})=>existsSync(file)?parseJsonc(readFileSync(safeTarget(root,file),'utf8')):fallback;
@@ -66,8 +66,8 @@ export function install({root=configDirectory(),source=packageRoot,settingsPatch
     const before=existsSync(file)?readFileSync(file,'utf8'):null;
     if(before!==body)edits.push({file,before,body});
   }
-  stage(settingsPath,json(settings));
-  for(const name of ['opencode','cli']) {
+  if(!assetsOnly)stage(settingsPath,json(settings));
+  for(const name of assetsOnly?[]:['opencode','cli']) {
     const file=configPath(root,name),value=read(file);
     if(value.plugins!==undefined&&!Array.isArray(value.plugins))throw Error('plugins must be an array.');
     // Remove only entries owned by this package (and the superseded personal sidebar).
@@ -91,7 +91,7 @@ export function install({root=configDirectory(),source=packageRoot,settingsPatch
     if(before!==null&&before!==body&&files[relative]!==digest(before)){conflicts.push(relative);continue;}
     stage(file,body);files[relative]=digest(body);
   }
-  const manifest={version:1,packageVersion:JSON.parse(readFileSync(path.join(source,'package.json'),'utf8')).version,files};
+  const manifest={version:1,packageVersion:JSON.parse(readFileSync(path.join(source,'package.json'),'utf8')).version,files,preservedCustomFiles:conflicts};
   stage(managedPath,json(manifest));
   const backup=path.join(root,'backups','hybrid-'+Date.now()+'-'+randomUUID());
   if(apply&&edits.length) {
@@ -110,3 +110,15 @@ export function install({root=configDirectory(),source=packageRoot,settingsPatch
   }
   return {configDirectory:root,settingsPath,changed:edits.map(e=>path.relative(root,e.file)),preservedCustomFiles:conflicts,backup:apply&&edits.length?backup:null,applied:apply};
 }
+
+// A new package version must refresh its managed instructions without requiring
+// users to save reviewer settings again. Never rewrite config/auth/task files.
+export function refreshManagedAssets({root=configDirectory(),source=packageRoot}={}) {
+  const settingsPath=safeTarget(root,path.join(root,'hybrid','config.json'));
+  if(!existsSync(settingsPath)||parseJsonc(readFileSync(settingsPath,'utf8')).setupComplete===false)return null;
+  const manifestPath=safeTarget(root,path.join(root,'hybrid','installed.json'));
+  const installed=existsSync(manifestPath)?parseJsonc(readFileSync(manifestPath,'utf8')):{};
+  const version=JSON.parse(readFileSync(path.join(source,'package.json'),'utf8')).version;
+  if(installed.packageVersion===version)return null;
+  return install({root,source,registerPlugin:false,assetsOnly:true});
+}

package/lib/native-result.mjs

@@ -26,6 +26,7 @@ export async function readNativeResult(ctx,sessionID,{isAborted=()=>false,onReco
  // Accept only an exact single JSON fence wrapper, not prose or guessed JSON
  // substrings. The complete enclosed object still passes the same strict schema.
  const fenced=/^```(?:json)?[ \t]*\r?\n([\s\S]*)\r?\n```$/.exec(text);
- let result;try{result=validateResult(JSON.parse(fenced?fenced[1]:text));}catch{throw Error('Reviewer returned invalid JSON; no approval recorded.');}
+ let parsed;try{parsed=JSON.parse(fenced?fenced[1]:text);}catch{throw Error('Reviewer returned invalid JSON; no approval recorded.');}
+ let result;try{result=validateResult(parsed);}catch(error){throw Error('Reviewer returned a schema-invalid result: '+error.message+' No approval recorded.');}
  return {result,session};
 }

package/lib/planning-continuation.mjs

@@ -0,0 +1,40 @@
+import {planningNext} from '../core/planning-escalation.mjs';
+
+const SOURCE='hybrid-planning-handoff';
+const terminalText=m=>(m?.content??[]).filter(p=>p.type==='text').map(p=>p.text??'').join('').trim();
+function unchangedEscalation(parts){
+ const last=parts.findLast(p=>p.name==='hybrid_checkpoint');
+ if(last?.state?.status!=='completed'||last.state.input?.action!=='escalate')return false;
+ const content=last.state.content;
+ const text=typeof content==='string'?content:Array.isArray(content)?content.filter(p=>p.type==='text').map(p=>p.text??'').join(''):'';
+ try{return JSON.parse(text).escalationUnchanged===true;}catch{return false;}
+}
+function explicitHandoff(request){
+ const text=request.replace(/\b(?:do not|don't|never)\s+(?:stop|pause|cancel)\b/gi,'continue');
+ if(/\b(stop|pause|cancel|do not continue|don't continue|status only|do not run|don't run)\b/i.test(text))return true;
+ // Be conservative about handoffs. The single supported deferred boundary is
+ // explicit completion of planning before waiting; it is still pending here.
+ const remaining=text.replace(/\b(finish|complete|finalize)\b[^.!?\n]{0,55}\bplan(?:ning)?\b[^.!?\n]{0,35}\bthen\s+wait\b/gi,'');
+ return /\b(wait|hold|await)\b/i.test(remaining);
+}
+export function planningStopDecision(messages,state,sessionID,background=[]){
+ const next=planningNext(state);
+ if(!next||!['escalate','research','resubmit'].includes(next.kind)||background.some(w=>w.sessionID===sessionID))return null;
+ const userIndex=messages.findLastIndex(m=>m.type==='user');if(userIndex<0)return null;
+ const user=messages[userIndex],request=user.text??terminalText(user);
+ // Explicit human stop/status-only requests do not authorize more work.
+ if(explicitHandoff(request))return null;
+ const turn=messages.slice(userIndex+1),last=turn.findLast(m=>m.type==='assistant');
+ if(!last||last.error||last.finish!=='stop'||!terminalText(last))return null;
+ if(turn.some(m=>m.type==='assistant'&&(m.error||['error','length','content-filter'].includes(m.finish))))return null;
+ const parts=turn.filter(m=>m.type==='assistant').flatMap(m=>m.content??[]).filter(p=>p.type==='tool');
+ if(parts.some(p=>p.state?.status==='error'||p.name==='question'))return null;
+ const participates=parts.some(p=>p.name==='hybrid_checkpoint'&&p.state?.status==='completed'&&
+  (['plan','escalate'].includes(p.state.input?.action)||p.state.input?.action==='research'&&['note','packages'].includes(p.state.input?.kind)));
+ if(!participates)return null;
+ if(unchangedEscalation(parts))return {notice:'The premium lead already evaluated the unchanged planning evidence. Follow its saved research/decision instructions; no approval was granted and no reset is needed.'};
+ const metadata={source:SOURCE,taskID:state.id,key:next.key};
+ if(turn.some(m=>m.type==='synthetic'&&m.metadata?.source===SOURCE&&m.metadata?.taskID===state.id&&m.metadata?.key===next.key))return {notice:'Planning recovery made no evidence progress. The saved premium directive remains available; report the exact unavailable capability or decision instead of resetting the task. Approval is unchanged.'};
+ return {resume:false,metadata,description:'Hybrid Workflow: returning unfinished planning to the premium lead’s recovery path.',
+  text:`The current planning checkpoint has an actionable next step, not a request to reset the workflow. Continue within this execution. Next kind: ${next.kind}; checkpoint action: ${next.action}. ${next.instructions}\nFor escalate, send the findings and concrete observations in checks to hybrid_checkpoint escalate now. For research, collect only the lead-requested facts, save attributed evidence with research kind=note and submit plan; do not invent security/architecture contracts. For resubmit, call plan with the premium directive and collected evidence. If the directive cannot be followed, escalate the exact missing tool/access or developer decision for premium evaluation. Never waive a finding, disable Hybrid or reset state. This message grants no developer approval; retain all explicit pauses and approval boundaries. New user input or interruption takes precedence.`};
+}

package/lib/settings-service.mjs

@@ -2,7 +2,7 @@ import {existsSync,readFileSync,writeFileSync,mkdirSync,renameSync} from 'node:f
 import path from 'node:path';
 import {createHash,randomUUID} from 'node:crypto';
 import {configDirectory,readSettings,settingsFile,packageRoot} from './config.mjs';
-import {install,parseJsonc,safeTarget} from './install.mjs';
+import {install,parseJsonc,safeTarget,refreshManagedAssets} from './install.mjs';
 import {selection} from './select-reviewers.mjs';
 import {commandSpec} from './commands.mjs';
 import {runProcess,requireCliAuthentication} from '../core/workers.mjs';
@@ -29,7 +29,7 @@ export function validateChoices(input,catalog,previous){
  if(!['astra','opus'].includes(input.designAuthor)||!reviewers[input.designAuthor])throw Error('Choose an enabled planning/design lead.');
  return {reviewers,designAuthor:input.designAuthor};
 }
-export function createSettingsService(ctx,options={}){
+export function createSettingsService(ctx,options={},refreshState={}){
  const root=configDirectory(),file=settingsFile(options);
  const readOnly=path.resolve(file)!==path.join(root,'hybrid','config.json');
  const load=()=>readSettings(options);
@@ -43,18 +43,26 @@ export function createSettingsService(ctx,options={}){
   if(before!==null)writeFileSync(path.join(backup,path.basename(target)),before,{mode:0o600});
   const tmp=target+'.hybrid-'+randomUUID();writeFileSync(tmp,JSON.stringify(value,null,2)+'\n',{mode:0o600});renameSync(tmp,target);
  };
- const persist=patch=>install({root,settingsPatch:{...(!existsSync(file)?{setupComplete:false}:{}),...patch},registerPlugin:false});
+ const persist=patch=>{const result=install({root,settingsPatch:{...(!existsSync(file)?{setupComplete:false}:{}),...patch},registerPlugin:false});delete refreshState.error;return result;};
  async function exclusive(fn){if(readOnly)throw Error('This installation uses a custom OPENCODE_HYBRID_CONFIG override. It remains active; interactive changes require the standard global configuration location.');if(writes.has(file))throw Error('Another settings change is in progress. Please retry when it finishes.');writes.add(file);try{return await fn();}finally{writes.delete(file);}}
  async function get(){
   const config=load(),models=await catalog();
   return {configured:existsSync(file)&&config.setupComplete!==false,readOnly,revision:revision(file),version:JSON.parse(readFileSync(path.join(packageRoot,'package.json'),'utf8')).version,
    reviewers:config.reviewers,designAuthor:config.designAuthor??(config.reviewers.opus?'opus':'astra'),browserEnabled:!!config.reviewBrowser?.enabled,impeccableEnabled:config.design.impeccable===true,
    catalog:models.map(m=>({providerID:m.providerID,id:m.id,name:m.name,variants:(m.variants??[]).map(v=>v.id),vision:m.capabilities.input?.includes('image')===true})),
-   configFile:file,implementationModel:globalRead().model??'Selected in OpenCode',host:process.platform};
+   configFile:file,implementationModel:globalRead().model??'Selected in OpenCode',host:process.platform,instructionsWarning:refreshState.error??null};
  }
  async function diagnostics(){
   const config=load(),checks=[];
   const check=async(name,fn)=>{try{checks.push({name,ok:true,detail:await fn()});}catch(e){checks.push({name,ok:false,detail:e.message});}};
+  await check('Managed instructions',async()=>{
+   if(refreshState.error)throw Error(refreshState.error);
+   const manifest=path.join(root,'hybrid','installed.json');
+   if(!existsSync(manifest))return 'Not installed yet; complete Hybrid setup.';
+   const installed=parseJsonc(readFileSync(safeTarget(root,manifest),'utf8'));
+   if(installed.preservedCustomFiles?.length)throw Error('Kept customized files unchanged: '+installed.preservedCustomFiles.join(', ')+'. Compare them with the updated package instructions before opting into replacement.');
+   return 'Managed assets installed for '+installed.packageVersion;
+  });
   for(const [name,exe] of [['Node','node'],['Git','git'],['pnpm',config.pnpmExecutable],['Design research Python',config.design.pythonExecutable]])await check(name,async()=>{const spec=commandSpec(exe);return (await runProcess(spec.executable,[...spec.args,'--version'],root,'',15000)).trim().split('\n')[0];});
   const models=await catalog();
   for(const [who,lane] of Object.entries(config.reviewers))if(lane)await check(who==='astra'?'Reviewer 1':'Reviewer 2',async()=>{
@@ -137,7 +145,12 @@ export function createSettingsService(ctx,options={}){
  };
 }
 export async function registerSettings(ctx,options){
- const service=createSettingsService(ctx,options);
+ // Custom settings files retain their existing read-only behavior. Only update
+ // package-managed assets for the normal config root, before starting sessions.
+ const root=configDirectory();
+ const standard=path.resolve(settingsFile(options))===path.join(root,'hybrid','config.json'),refreshState={};
+ if(standard)try{refreshManagedAssets({root});}catch(error){refreshState.error='Managed instructions could not be refreshed and may be outdated: '+error.message+'. Resolve the file problem and restart OpenCode to retry.';}
+ const service=createSettingsService(ctx,options,refreshState);
  // Expected setup errors must reach the dialog, not become opaque HTTP defects.
  const handlers=Object.fromEntries(Object.entries(service).map(([name,fn])=>[name,async(...args)=>{try{return await fn(...args);}catch(error){return {error:{message:error.message}};}}]));
  await ctx.rpc.register(SettingsRPC,handlers);return service;

package/package.json

@@ -1,76 +1,76 @@
-{
-  "name": "@rockysoft/opencode-hybrid-workflow",
-  "version": "1.1.2",
-  "description": "Portable configurable-reviewer planning, design, implementation checkpoints and usage sidebar for OpenCode 2",
-  "type": "module",
-  "license": "MIT",
-  "author": "RockySoft",
-  "keywords": [
-    "opencode",
-    "opencode-plugin",
-    "agents",
-    "code-review",
-    "workflow"
-  ],
-  "publishConfig": {
-    "access": "public",
-    "tag": "latest"
-  },
-  "exports": {
-    ".": "./index.js",
-    "./tui": "./tui.js"
-  },
-  "bin": {
-    "opencode-hybrid": "./cli.mjs"
-  },
-  "files": [
-    "index.js",
-    "tui.js",
-    "cli.mjs",
-    "lib/",
-    "core/",
-    "sidebar/",
-    "assets/",
-    "README.md",
-    "THIRD_PARTY_NOTICES.md",
-    "LICENSE",
-    "docs/"
-  ],
-  "engines": {
-    "node": ">=22"
-  },
-  "scripts": {
-    "build": "node scripts/build.mjs",
-    "prepack": "npm run build",
-    "test": "node --test test/*.test.mjs",
-    "doctor": "node cli.mjs doctor"
-  },
-  "devDependencies": {
-    "@babel/core": "7.29.7",
-    "@babel/preset-typescript": "7.27.1",
-    "babel-preset-solid": "1.9.12"
-  },
-  "peerDependencies": {
-    "@opencode/plugin": ">=2.1.2 <3",
-    "@opentui/core": ">=0.6.6",
-    "@opentui/solid": ">=0.6.6",
-    "solid-js": ">=1.9.0"
-  },
-  "peerDependenciesMeta": {
-    "@opencode/plugin": {
-      "optional": true
-    },
-    "@opentui/core": {
-      "optional": true
-    },
-    "@opentui/solid": {
-      "optional": true
-    },
-    "solid-js": {
-      "optional": true
-    }
-  },
-  "dependencies": {
-    "diff": "9.0.0"
-  }
-}
+{
+  "name": "@rockysoft/opencode-hybrid-workflow",
+  "version": "1.3.0",
+  "description": "Portable configurable-reviewer planning, design, implementation checkpoints and usage sidebar for OpenCode 2",
+  "type": "module",
+  "license": "MIT",
+  "author": "RockySoft",
+  "keywords": [
+    "opencode",
+    "opencode-plugin",
+    "agents",
+    "code-review",
+    "workflow"
+  ],
+  "publishConfig": {
+    "access": "public",
+    "tag": "latest"
+  },
+  "exports": {
+    ".": "./index.js",
+    "./tui": "./tui.js"
+  },
+  "bin": {
+    "opencode-hybrid": "./cli.mjs"
+  },
+  "files": [
+    "index.js",
+    "tui.js",
+    "cli.mjs",
+    "lib/",
+    "core/",
+    "sidebar/",
+    "assets/",
+    "README.md",
+    "THIRD_PARTY_NOTICES.md",
+    "LICENSE",
+    "docs/"
+  ],
+  "engines": {
+    "node": ">=22"
+  },
+  "scripts": {
+    "build": "node scripts/build.mjs",
+    "prepack": "npm run build",
+    "test": "node --test test/*.test.mjs",
+    "doctor": "node cli.mjs doctor"
+  },
+  "devDependencies": {
+    "@babel/core": "7.29.7",
+    "@babel/preset-typescript": "7.27.1",
+    "babel-preset-solid": "1.9.12"
+  },
+  "peerDependencies": {
+    "@opencode/plugin": ">=2.1.2 <3",
+    "@opentui/core": ">=0.6.6",
+    "@opentui/solid": ">=0.6.6",
+    "solid-js": ">=1.9.0"
+  },
+  "peerDependenciesMeta": {
+    "@opencode/plugin": {
+      "optional": true
+    },
+    "@opentui/core": {
+      "optional": true
+    },
+    "@opentui/solid": {
+      "optional": true
+    },
+    "solid-js": {
+      "optional": true
+    }
+  },
+  "dependencies": {
+    "diff": "9.0.0"
+  }
+}

package/sidebar/settings.mjs

@@ -79,6 +79,7 @@ export function createSettingsUI(context,onSaved=()=>{}){
   if(open||disposed)return;open=true;
   try{
    let state=await invoke('get');
+   if(state.instructionsWarning)await alert('Managed instructions need attention',state.instructionsWarning);
    if(firstRun&&state.configured)return;
    if(!state.configured){await wizard(state);state=await invoke('get');}
    while(!disposed){
@@ -89,7 +90,7 @@ export function createSettingsUI(context,onSaved=()=>{}){
      {title:'Reviewer browser',value:'browser',description:state.browserEnabled?'Enabled · isolated sessions':'Disabled'},
      {title:'Design guidance',value:'designGuidance',description:state.impeccableEnabled?'Impeccable · enabled':'Standard · Impeccable available per request'},
      {title:'Tools and dependencies',value:'dependencies',description:'Browser installation is in Reviewer browser'},
-     {title:'Run diagnostics',value:'diagnostics',description:'Check setup and logins without model calls'},
+     {title:'Run diagnostics',value:'diagnostics',description:state.instructionsWarning?'Instructions update needs attention':'Check setup and logins without model calls'},
      {title:'About this setup',value:'about',description:'Global configuration and active-task behavior'},
     ]);
     if(!action)return;