aimship 0.1.0-preview.13 → 0.1.0-preview.15

package/lib/delivery.mjs

@@ -18,21 +18,22 @@ export function arrangeSessions(state) {
   if (state.deliveryPolicy?.version !== 1) return;
   for (const r of state.stageRuns) {
     if (r.sessionGroup) continue;
-    const category = ['frame','requirements','scope'].includes(r.stage) ? 'requirements' : ['tech-design','contract','prototype'].includes(r.stage) ? 'technical' : r.stage;
+    const category = ['frame','requirements'].includes(r.stage) ? 'requirements' : ['tech-design','contract','prototype'].includes(r.stage) ? 'technical' : r.stage;
     const batch = r.stage === 'review' && !r.overall && r.reviewOf?.length === 1 ? state.stageRuns.find(x=>x.id===r.reviewOf[0]) : null;
     r.sessionGroup = batch ? (batch.sessionGroup ?? `implement:${batch.id}`) : ['requirements','technical','test-design','plan'].includes(category) ? category : `${category}:${r.id}`;
   }
 }
 export function completionStatus(state, review, {changed=[]}={}) {
   const runs=state.stageRuns, gaps=[];
-  if (state.schemaVersion === 4 && (state.goal.endpoint === null || state.documentPolicy.authority === null || unknownConditions(state.documentPolicy).length)) gaps.push('Endpoint or artifact conditions remain unknown.');
+  if (state.goal.endpoint === null) gaps.push('Delivery endpoint remains unknown.');
+  if (state.documentPolicy.authority === null || unknownConditions(state.documentPolicy).length) gaps.push('Artifact conditions remain unknown.');
   if(changed.length) gaps.push('Changed or missing registered documents require reconciliation.');
   const ready=r=>review.runs.find(x=>x.id===r.id)?.ready;
   const has=stage=>runs.some(r=>r.stage===stage && ready(r));
   for (const stage of ['tech-design','test-design','plan','implement','verify','handoff']) if (!has(stage)) gaps.push(`Missing current completed ${stage}.`);
-  if (!runs.some(r=>['requirements','scope'].includes(r.stage) && ready(r))) gaps.push('Missing reviewed requirements / Scope.');
-  if ((state.documentPolicy?.interface!=='none' || state.documentPolicy?.databases?.length) && !has('contract')) gaps.push('Missing applicable interface/SQL contract.');
-  if (state.documentPolicy?.interaction && !state.documentPolicy.prototypeCovered && !has('prototype')) gaps.push('Missing applicable interaction prototype.');
+  if (!runs.some(r=>r.stage==='requirements' && ready(r))) gaps.push('Missing reviewed requirements.');
+  if (((state.documentPolicy?.interface!=null && state.documentPolicy.interface!=='none') || state.documentPolicy?.databases?.length) && !has('contract')) gaps.push('Missing applicable interface/SQL contract.');
+  if (runs.some(r=>r.stage==='prototype') && !has('prototype')) gaps.push('Missing applicable interaction prototype.');
   if (review.runs.some(r=>!r.ready)) gaps.push('Selected work or document approvals remain unresolved.');
   const implementations=runs.filter(r=>r.stage==='implement');
   if (implementations.some(r=>['failed','mixed','unknown','not-run'].includes(r.result))) gaps.push('Implementation results remain unresolved.');
@@ -55,6 +56,16 @@ export function completionStatus(state, review, {changed=[]}={}) {
   const readyForAcceptance=!partial && !gaps.length;
   return {status:partial?'partial-scope':readyForAcceptance && state.outcome.goal==='met' && state.outcome.acceptance==='accepted'?'standard-complete':readyForAcceptance?'ready-for-acceptance':'incomplete',standardComplete:readyForAcceptance && state.outcome.goal==='met' && state.outcome.acceptance==='accepted',readyForAcceptance,gaps:gaps.map(g=>completionMessage(state,g)),partialRef:state.deliveryPolicy.partialRef??null,scope:text(state,'Recorded structure, approvals and results only; not independent proof of test execution or semantic quality.','仅评估已记录的结构、审批和结果；不独立证明测试已执行或内容语义正确。')};
 }
+// A display suggestion, never a scheduled run or authorization.
+export function suggestedNextStage(state) {
+  const current=state.stageRuns.find(r=>r.id===state.currentRun) ?? state.stageRuns.at(-1);
+  const scheduled=current?state.stageRuns[state.stageRuns.indexOf(current)+1]:state.stageRuns[0];
+  if(scheduled)return scheduled.stage;
+  if(state.deliveryPolicy.partialRef)return null;
+  if(!current)return 'requirements';
+  const contracts=(state.documentPolicy.interface!=null && state.documentPolicy.interface!=='none') || state.documentPolicy.databases?.length;
+  return ({frame:'requirements',requirements:'tech-design',prototype:'tech-design','tech-design':contracts?'contract':'test-design',contract:'test-design','test-design':'plan',plan:'implement',implement:'review',review:current.overall?'verify':'review',verify:'handoff'})[current.stage]??null;
+}
 export function sessionAdvice(directory,state,review,{saved=true}={}) {
   const groups=[];
   for (const r of state.stageRuns) {
@@ -67,15 +78,15 @@ export function sessionAdvice(directory,state,review,{saved=true}={}) {
   const concluded=state.outcome.goal==='met' && review.runs.every(r=>r.ready)
     && (!!state.deliveryPolicy?.partialRef || completionStatus(state,review).readyForAcceptance);
   const last=state.stageRuns.at(-1);
-  const endAction=concluded?'finished':(current??last)?.stage==='handoff'?'assess-outcome':'arrange-next';
+  const endAction=concluded?'finished':(current??last)?.stage==='handoff'?'assess-outcome':'await-continue';
   let action='continue-current';
   if (!saved) action='reconcile-save';
   else if(pending) action='await-review';
   else if(!current && state.stageRuns.length && review.runs.every(r=>r.ready)) action=concluded?endAction:review.runs.some(r=>r.releaseReady===false)?'resolve-current':endAction;
   else if(current && ((!status?.resolvedBy && (['failed','mixed','unknown','not-run'].includes(current.result) || (current.stage==='review' && current.progress==='done' && !status?.releaseReady))) || current.progress==='blocked' || ['needs-review','unknown'].includes(current.applicability))) action=concluded && !next?'finished':'resolve-current';
-  else if(status?.ready) action=!next?endAction:next.progress!=='planned'?'inspect-existing-work':current.sessionGroup && current.sessionGroup===next.sessionGroup?'continue-group':'suggest-new-session';
+  else if(status?.ready) action=!next?endAction:next.progress!=='planned'?'inspect-existing-work':'await-continue';
   if (saved && !pending && state.deliveryPolicy?.version === 1 && status?.ready && next && review.runs.find(r=>r.id===next.id)?.blockedBy.length) action='resolve-current';
-  const instruction=action==='arrange-next'?text(state,'The recorded work has ended, but the delivery goal remains open. Read the agreed endpoint and saved next action; arrange only the next authorized work, or record an evidenced scope conclusion.','已登记工作已完成，但交付目标尚未结束。请读取约定终点与已保存的下一步，安排下一项已授权工作，或依据实际证据记录范围结论。'):action==='assess-outcome'?text(state,'Review the handoff against the agreed goal and record the actual goal conclusion and acceptance; completed handoff alone does not end the delivery.','请对照约定目标审阅交付材料，记录实际目标结论和用户接受结果；完成交付文档不等于交付已结束。'):null;
+  const instruction=action==='await-continue'?text(state,'This stage is saved. Stop here and wait for the user to continue; a new session is recommended, not required. Approval and continuation may be expressed together.','本阶段已保存。请在此停下，等待用户继续；建议新会话，也可在当前会话继续。批准和继续可以一次表达。'):action==='assess-outcome'?text(state,'Review the handoff against the agreed goal and record the actual goal conclusion and acceptance; completed handoff alone does not end the delivery.','请对照约定目标审阅交付材料，记录实际目标结论和用户接受结果；完成交付文档不等于交付已结束。'):null;
   const continuation=['reconcile-save','await-review','assess-outcome','finished'].includes(action)?null:text(state,`Use Aimship to continue delivery ${JSON.stringify(path.resolve(directory))}; first read its current state and relevant formal documents, then continue the recorded work.${instruction?' '+instruction:''}`,`使用 Aimship 继续交付「${path.resolve(directory)}」，先读取当前状态和相关正式文档再接续。${instruction??''}`);
-  return {action,currentRun:current?.id??null,nextRun:next?.id??null,groups,continuation,instruction,advisory:true,note:text(state,'A session boundary is not a blocker or approval. Continue here when requested. Resolve the delivery identity, current approvals and unfinished effects on every resume; this text grants no approval.','会话边界不是阻塞或批准。用户要求时可在当前会话继续。每次续接都需核对交付身份、当前审批和未完成事项；本提示不授予权限。')};
+  return {action,stop:!['continue-current','inspect-existing-work'].includes(action),suggestNewSession:['await-review','await-continue'].includes(action),currentRun:current?.id??null,nextRun:next?.id??null,groups,continuation,instruction,advisory:true,note:text(state,'A session boundary is not a blocker or approval. Continue here when requested. Resolve the delivery identity, current approvals and unfinished effects on every resume; this text grants no approval.','会话边界不是阻塞或批准。用户要求时可在当前会话继续。每次续接都需核对交付身份、当前审批和未完成事项；本提示不授予权限。')};
 }

package/lib/documents.mjs

@@ -54,7 +54,7 @@ export function sections(text, spec) {
     return {id, count:matches.length, start:h?.start, end, body:h?markdownText(text.slice(h.end,end)).trim():null};
   });
 }
-const ID = '(?:REQ|AC|B|TASK|TC|REV|RUN|CHG|Q|PAGE)-[0-9]{3,}';
+const ID = '(?:REQ|FR|BR|PERM|EC|AC|B|TASK|TC|REV|RUN|CHG|Q|PAGE)-[0-9]{3,}';
 export const numberedIds = text => [...new Set(markdownText(text).match(new RegExp('\\b'+ID+'\\b','g'))??[])];
 // A file-qualified Markdown citation names its own readable source. It does not
 // create a second local definition or a namespace/index.
@@ -71,7 +71,7 @@ function qualifiedCitations(text) {
   });
   return {references,local};
 }
-const definitionSections={REQ:['requirements','adoption'],AC:['acceptance'],B:['batches'],TASK:['tasks'],TC:['cases']};
+const definitionSections={REQ:['requirements'],FR:['requirements'],BR:['requirements'],PERM:['requirements'],EC:['requirements'],AC:['acceptance'],B:['batches'],TASK:['tasks'],TC:['cases']};
 const referenceHeading=title=>/\b(?:coverage|summary|references|conclusion|notes)\b|覆盖|总结|汇总|引用|结论|备注/i.test(title);
 export function definitions(text, file, spec) {
   const lines=markdownText(text).split('\n'), result=[], context=[];
@@ -120,15 +120,14 @@ export function hasLocator(text, locator, spec) {
   return headings(text).filter(h=>h.title===locator || h.key===normalizeHeading(locator)).length===1;
 }
 export function unknownConditions(policy) {
-  return ['interaction','interface','databases', ...(policy.interaction === false ? [] : ['prototypeCovered'])].filter(key=>policy[key] === null);
+  return ['interaction','interface','databases'].filter(key=>policy[key] === null);
 }
 export async function inspectDocuments(directory, state) {
   const map = await artifactMap(), issues = [], unchecked = [], digests = {}, defs = [], documentSections = new Map();
   const docs = state.documents ?? [];
   const policy = state.documentPolicy;
   for (const kind of new Set(docs.map(d=>d.kind))) if (!['sql','source'].includes(kind) && docs.filter(d=>d.kind===kind).length>1) issues.push(`Register one current artifact for ${kind}; keep history through references.`);
-  if (docs.some(d=>d.kind==='prd'&&d.mode==='new') && docs.some(d=>d.kind==='scope'&&d.mode==='new')) issues.push('Do not create competing new PRD and Scope entries.');
-  const requirementKind = policy.authority === 'adopted' ? 'scope' : 'prd';
+  const requirementKind = 'prd';
   const find = kind => docs.find(d => d.kind === (kind === 'requirement' ? requirementKind : kind));
   if (state.schemaVersion === 4) {
     try {
@@ -140,8 +139,7 @@ export async function inspectDocuments(directory, state) {
   const preparing = state.schemaVersion === 4 && !find('requirement');
   if (preparing && state.goalRef !== 'source/request.md') issues.push('Before requirements exist, goalRef must point to source/request.md.');
   if (!preparing && !find('requirement')) issues.push(`Register ${requirementKind} as the requirement entry.`);
-  if (!preparing && policy.authority === null) issues.push('Select the requirement authority when registering PRD/Scope.');
-  if (!preparing && policy.authority !== 'editable' && state.goalRef.split('#')[0] !== `${requirementKind}.md`) issues.push('goalRef must point to the selected root PRD/Scope.');
+  if (!preparing && policy.authority === null) issues.push('Select the requirement authority when registering PRD.');
   if (find('requirement') && state.goalRef.split('#')[0]!==find('requirement').path) issues.push('goalRef must point to the registered requirement authority.');
   for (const doc of docs) {
     const spec = map.documents[doc.kind];
@@ -161,7 +159,7 @@ export async function inspectDocuments(directory, state) {
       // Reuse is a current input option, not a historical document protocol.
       // Read ordinary IDs from the explicitly registered requirement authority;
       // do not impose our outline or infer that arbitrary source formats passed.
-      if (doc === find('requirement') && /\.md$/i.test(doc.path)) defs.push(...definitions(text,doc.path).filter(d=>/^(REQ|AC|PAGE|Q)-/.test(d.id)));
+      if (doc === find('requirement') && /\.md$/i.test(doc.path)) defs.push(...definitions(text,doc.path));
       unchecked.push(`${doc.path}: reused format/content; human/Agent basis ${doc.basisRef}.`); continue;
     }
     if (spec) {
@@ -172,7 +170,7 @@ export async function inspectDocuments(directory, state) {
         previous=record.start;
         if(record.count===1 && !record.body) issues.push(`${doc.path}: empty section ${record.id}.`);
       }
-      const owned={prd:['REQ','AC','PAGE'],scope:['REQ','AC','PAGE'],plan:['B','TASK'],testing:['TC','RUN'],review:['REV'],'change-log':['CHG']}[doc.kind]??[];
+      const owned={prd:['REQ','FR','BR','PERM','EC','AC','PAGE'],plan:['B','TASK'],testing:['TC','RUN'],review:['REV'],'change-log':['CHG']}[doc.kind]??[];
       defs.push(...definitions(text, doc.path, spec).filter(d=>owned.includes(d.id.split('-')[0]) || d.id.startsWith('Q-')));
     }
   }
@@ -180,7 +178,7 @@ export async function inspectDocuments(directory, state) {
   for (const [i, run] of state.stageRuns.entries()) {
     if (run.progress === 'planned') continue;
     const contract = map.stages[run.stage], doc = find(contract.kind) ?? (run.stage === 'contract' && policy.interface === 'none' ? find('sql') : null);
-    if (!doc && preparing && ['frame','requirements','scope'].includes(run.stage) && run.progress !== 'done') continue;
+    if (!doc && preparing && ['frame','requirements'].includes(run.stage) && run.progress !== 'done') continue;
     if (!doc) { issues.push(`${run.id}: missing registered ${contract.kind} artifact.`); continue; }
     if (run.stage === 'implement' && !state.stageRuns.slice(0,i).some(r => r.stage === 'plan' && r.progress === 'done')) issues.push(`${run.id}: complete plan before implementation.`);
     if (run.progress === 'done') {
@@ -210,7 +208,7 @@ export async function inspectDocuments(directory, state) {
   }
   if (state.schemaVersion === 4) {
     const unknown = unknownConditions(policy);
-    const dependent = runs.filter(r=>r.progress !== 'planned' && !['frame','requirements','scope','diagnose'].includes(r.stage));
+    const dependent = runs.filter(r=>r.progress !== 'planned' && !['frame','requirements','diagnose'].includes(r.stage));
     if (preparing && dependent.length) issues.push('Prepare and review formal requirements before dependent work.');
     if (state.goal.endpoint === null && dependent.length) issues.push('Resolve the delivery endpoint before dependent work; initialization grants no further authorization.');
     if (unknown.length && runs.some(r=>(r.stage === 'tech-design' && r.progress === 'done') || (['contract','test-design','plan','implement'].includes(r.stage) && r.progress !== 'planned'))) issues.push(`Resolve artifact conditions before completing design or dependent work: ${unknown.join(', ')}.`);
@@ -220,7 +218,7 @@ export async function inspectDocuments(directory, state) {
     const doc=find('contract');
     if (doc?.mode === 'new' && doc.path !== 'openapi.yaml') issues.push('New HTTP contract must be openapi.yaml.');
   }
-  if (policy.interaction && !policy.prototypeCovered && runs.some(r => r.stage === 'implement' && r.progress !== 'planned') && !state.stageRuns.some(r => r.stage === 'prototype' && r.progress === 'done')) issues.push('Uncovered interaction requires completed prototype before implementation.');
+  if (runs.some(r=>r.stage==='implement' && r.progress!=='planned') && runs.some(r=>r.stage==='prototype' && r.progress!=='done')) issues.push('Complete the selected prototype before implementation.');
   const seen=new Set();
   for(const d of defs) {
     if(seen.has(d.id)) issues.push(`Duplicate definition ${d.id}.`);
@@ -246,8 +244,9 @@ export async function inspectDocuments(directory, state) {
       || (state.reviewHistory??[]).some(r=>r.document===doc.path && r.version===doc.version && (r.kind==='approved' || (r.kind==='self-check' && r.result==='passed')));
     const records=documentSections.get(doc.path)??[];
     if(ready) {
+      if(doc.kind==='prd' && !defs.some(d=>d.file===doc.path && /^(REQ|FR|BR|PERM|EC)-/.test(d.id))) issues.push(`${doc.path}: include substantive requirement records (REQ or adopted business IDs).`);
       for(const section of records) if(!meaningful(section.body??'')) issues.push(`${doc.path}: replace template guidance with substantive ${section.id} content.`);
-      for(const prefix of ({prd:['REQ','AC'],scope:['REQ','AC'],testing:['TC'],plan:['TASK']}[doc.kind]??[])) {
+      for(const prefix of ({prd:['AC'],testing:['TC'],plan:['TASK']}[doc.kind]??[])) {
         if(!defs.some(d=>d.file===doc.path && d.id.startsWith(prefix+'-'))) issues.push(`${doc.path}: include substantive ${prefix} records.`);
       }
     }

package/lib/language.mjs

@@ -3,12 +3,12 @@ export const languageOf = state => state.language;
 export const text = (state, english, chinese) => languageOf(state) === 'zh-CN' ? chinese : english;
 const labels = {
  'not recorded':'未记录', unknown:'未知', null:'未知', true:'是', false:'否', none:'不适用', http:'HTTP', other:'其他',
- technical:'技术与契约', unrecorded:'未分组', unavailable:'不可用', 'assess-outcome':'核对交付结论与接受结果', frame:'目标梳理', requirements:'需求', scope:'范围确认', prototype:'原型', 'tech-design':'技术设计', contract:'接口与 SQL', 'test-design':'测试设计', plan:'实施计划', implement:'实施', review:'审查', verify:'验证', handoff:'交付验收', diagnose:'调查',
+ technical:'技术与契约', unrecorded:'未分组', unavailable:'不可用', 'assess-outcome':'核对交付结论与接受结果', frame:'目标梳理', requirements:'需求', prototype:'原型', 'tech-design':'技术设计', contract:'接口与 SQL', 'test-design':'测试设计', plan:'实施计划', implement:'实施', review:'审查', verify:'验证', handoff:'交付验收', diagnose:'调查',
  planned:'待开始', active:'进行中', blocked:'受阻', done:'已完成记录', passed:'通过', failed:'失败', 'not-run':'未执行', mixed:'部分通过', current:'当前有效', 'needs-review':'待复核',
  'in-progress':'进行中', met:'已达成', 'not-met':'未达成', 'not-recorded':'未记录', accepted:'已接受', declined:'未接受',
  approved:'已批准', pending:'待审核', 'self-check-required':'待自检', 'self-check-failed':'自检失败', 'changes-requested':'需修改', 'evidence-changed':'审批依据已变化',
  'partial-scope':'明确限定范围', 'standard-complete':'标准交付已完成', 'ready-for-acceptance':'待验收', incomplete:'未完成',
- 'continue-current':'继续当前工作', 'continue-group':'继续当前组工作', 'suggest-new-session':'建议新开会话', 'inspect-existing-work':'检查已有工作', 'resolve-current':'先处理当前问题', 'await-review':'等待审核', 'reconcile-save':'核对保存结果', finished:'当前约定目标已结束', 'arrange-next':'确认并记录下一项工作',
+ 'continue-current':'继续当前工作', 'await-continue':'等待继续', 'inspect-existing-work':'检查已有工作', 'resolve-current':'先处理当前问题', 'await-review':'等待审核', 'reconcile-save':'核对保存结果', finished:'当前约定目标已结束', 'arrange-next':'确认并记录下一项工作',
  'requirements preparation':'需求准备', supported:'已启用', enforced:'已启用',
  interaction:'交互变化', prototypeCovered:'已有原型覆盖', interface:'接口变化', databases:'数据库变化'
 };
@@ -17,9 +17,10 @@ export function displayValue(state,value) {
  return languageOf(state)==='zh-CN' ? (labels[raw] ?? raw) : raw;
 }
 const explanations = {
- 'Endpoint or artifact conditions remain unknown.':'交付终点或产物适用条件尚未明确。',
+ 'Delivery endpoint remains unknown.':'交付终点尚待确认。',
+ 'Artifact conditions remain unknown.':'产物适用条件待技术设计确认。',
  'Changed or missing registered documents require reconciliation.':'已登记文档有变化或缺失，需要核对。',
- 'Missing reviewed requirements / Scope.':'缺少已完成审核的需求或范围文档。',
+ 'Missing reviewed requirements.':'需求文档尚未完成审核。',
  'Missing applicable interface/SQL contract.':'缺少本次适用的接口或 SQL 契约。',
  'Missing applicable interaction prototype.':'缺少本次适用的交互原型。',
  'Selected work or document approvals remain unresolved.':'已安排工作或文档审批仍有未完成项。',

package/lib/state.mjs

@@ -10,7 +10,7 @@ import { randomUUID } from 'node:crypto';
 import { atomicWrite, exists, fail, hash, inside, json, noSymlinks, readJSON, withLock } from './io.mjs';
 
 export const SCHEMA_VERSION = 4;
-export const STAGES = ['frame', 'requirements', 'prototype', 'scope', 'diagnose', 'tech-design', 'contract', 'test-design', 'plan', 'implement', 'review', 'verify', 'handoff'];
+export const STAGES = ['frame', 'requirements', 'prototype', 'diagnose', 'tech-design', 'contract', 'test-design', 'plan', 'implement', 'review', 'verify', 'handoff'];
 const PROGRESS = ['planned', 'active', 'blocked', 'done'];
 const RESULTS = ['passed', 'failed', 'not-run', 'unknown', 'mixed'];
 const OUTCOME_REFS = ['goalConclusionRef', 'acceptanceRef', 'mergeRef', 'deploymentRef', 'handoffRef'];
@@ -42,7 +42,7 @@ export function validateState(state) {
       requireThat(Array.isArray(state.documents), 'documents must be an array.');
       const paths = new Set();
       for (const d of state.documents) {
-        requireThat(object(d) && ['prd','scope','tech-design','plan','testing','review','diagnosis','handoff','change-log','prototype','contract','sql','source'].includes(d.kind) && ['new','reused'].includes(d.mode) && string(d.version), 'Invalid document registration.');
+        requireThat(object(d) && ['prd','tech-design','plan','testing','review','diagnosis','handoff','change-log','prototype','contract','sql','source'].includes(d.kind) && ['new','reused'].includes(d.mode) && string(d.version), 'Invalid document registration.');
         ref(d.path, 'documents.path'); requireThat(!d.path.includes('#') && !paths.has(d.path), 'Document paths must be unique and have no fragment.'); paths.add(d.path);
         if (d.assetRefs !== undefined) refs(d.assetRefs, 'documents.assetRefs');
         if (d.mode === 'reused') { ref(d.basisRef, 'documents.basisRef'); }
@@ -191,7 +191,7 @@ export async function updateState(directory, patch, revision, rulesVersion, runt
     requireThat(previous.deliveryPolicy === undefined || next.deliveryPolicy?.version === previous.deliveryPolicy.version, 'Cannot remove or downgrade deliveryPolicy.');
     arrangeSessions(next); validateState(next);
     // Registering the first formal basis is not a new user scope decision.
-    const formalizing = previous.schemaVersion === 4 && previous.goalRef === 'source/request.md' && !previous.documents.some(d=>['prd','scope'].includes(d.kind)) && next.documents.some(d=>['prd','scope'].includes(d.kind) && d.path === next.goalRef.split('#')[0]);
+    const formalizing = previous.schemaVersion === 4 && previous.goalRef === 'source/request.md' && !previous.documents.some(d=>d.kind==='prd') && next.documents.some(d=>d.kind==='prd' && d.path === next.goalRef.split('#')[0]);
     if (JSON.stringify(previous.goal) !== JSON.stringify(next.goal) || (previous.goalRef !== next.goalRef && !formalizing)) {
       requireThat(string(next.goal.decisionRef) && next.goal.decisionRef !== previous.goal.decisionRef, 'Goal revision requires a new explicit decisionRef; viewing results does not revise a goal.');
       next.goalHistory = [...(previous.goalHistory ?? []), { goal: previous.goal, goalRef: previous.goalRef, deliveryPolicy: previous.deliveryPolicy, outcome: previous.outcome, revision: previous.revision }];

package/lib/view.mjs

@@ -1,5 +1,5 @@
 import { text, displayValue } from './language.mjs';
-import { completionStatus, sessionAdvice } from './delivery.mjs';
+import { completionStatus, sessionAdvice, suggestedNextStage } from './delivery.mjs';
 import fs from 'node:fs/promises';
 import { reviewStatus } from './approvals.mjs';
 import path from 'node:path';
@@ -28,37 +28,71 @@ async function available(directory,state,ref) {
   const p=resolveRef(directory,state,ref); return p && await exists(p);
 }
 export async function renderText(directory,state) {
-  const t=(en,zh)=>text(state,en,zh), v=x=>cell(displayValue(state,x)), identifier=x=>x==null?v(null):cell(x);
-  const artifactLink=ref=> {
-    if (!ref.startsWith('repo:')) return link(ref);
-    const target=resolveRef(directory,state,ref), fragment=ref.includes('#')?'#'+ref.split('#')[1]:'';
-    return target ? `[${cell(ref)}](${encodeURI(target).replaceAll('(','%28').replaceAll(')','%29')})` : cell(ref);
+  const t=(en,zh)=>text(state,en,zh), v=x=>cell(displayValue(state,x));
+  const artifactLink=ref=>ref.startsWith('repo:')
+    ? `[${cell(ref.split('#')[0])}](${encodeURI(resolveRef(directory,state,ref)).replaceAll('(','%28').replaceAll(')','%29')})`
+    : link(ref.split('#')[0]);
+  const review=await reviewStatus(directory,state), changed=await documentChanges(directory,state);
+  const completion=completionStatus(state,review,{changed}), session=sessionAdvice(directory,state,review);
+  const current=state.stageRuns.find(r=>r.id===state.currentRun) ?? state.stageRuns.at(-1);
+  const currentReview=review.runs.find(r=>r.id===current?.id);
+  const humanDocs=review.documents.filter(d=>currentReview?.documents.includes(d.path));
+  const failed=r=>['failed','mixed','unknown','not-run'].includes(r.result);
+  const progress=r=> {
+    const check=review.runs.find(x=>x.id===r.id);
+    if(r.progress==='planned')return t('Not started','尚未开始');
+    if(r.progress==='blocked' || check?.blockedBy.length || ['needs-review','unknown'].includes(r.applicability))return t('Needs attention','需要处理');
+    if(failed(r) && !check?.resolvedBy)return t('Result needs resolution','结果待处理');
+    if(check?.documents.some(file=>['self-check-failed','changes-requested','evidence-changed','unavailable'].includes(review.documents.find(d=>d.path===file)?.status)))return t('Needs revision or checking','需要修改或核对');
+    if(r.progress==='done' && check?.waiting.length)return t('Document prepared; awaiting review','文档已完成，待审核');
+    return r.progress==='done'?t('Completed','已完成'):t('In progress','进行中');
   };
-  const lines=[t('# Delivery status','# 交付状态'),'',t('Generated by Aimship. Edit formal documents and structured state, not this page.','由 Aimship 生成。请通过正式文档和结构化状态更新工作记录。'),'',t('## Goal and basis','## 目标与依据'),'',cell(state.goal.summary),'',`${t('Endpoint','交付终点')}: ${cell(state.goal.endpoint ?? t('Unknown — not yet agreed','未知，尚未约定'))}`,''];
-  lines.push(`${t('Display language','显示语言')}: ${state.language ?? v(null)}`,'');
-  if (state.schemaVersion===4) lines.push(t('Initialization: state saved; this page is the derived view.','初始化：状态已保存，本页为生成的视图。'),`${t('Requirements','需求')}: ${state.documents.some(d=>['prd','scope'].includes(d.kind))?t('registered; see document review','已登记，见文档审核'):t('being clarified; no formal document yet','正在澄清，尚无正式文档')}`,`${t('Artifact conditions','产物适用条件')}: ${['interaction','prototypeCovered','interface','databases'].map(k=>`${v(k)}=${state.documentPolicy[k]===null?v('unknown'):Array.isArray(state.documentPolicy[k])?(state.documentPolicy[k].length?state.documentPolicy[k].join(', '):v('none')):v(state.documentPolicy[k])}`).join(', ')}`,'');
-  if(await available(directory,state,state.goalRef))lines.push(artifactLink(state.goalRef),'');
-  lines.push(t('## Associated engineering objects','## 关联工程'),'',t('| ID | Actual checkout/worktree | Role |','| ID | 实际代码目录 | 用途 |'),'| --- | --- | --- |');
-  for(const r of state.repositories)lines.push(`| ${cell(r.id)} | ${cell(r.path)} | ${cell(r.role)} |`);
-  if(!state.repositories.length)lines.push(t('| — | No repository registered | — |','| — | 尚未关联代码仓库 | — |'));
-  lines.push('',t('## Stage progress','## 阶段进度'),'',t('| Run / scope | Stage | Progress | Result | Applicability |','| 工作记录 / 范围 | 阶段 | 进度 | 结果 | 有效性 |'),'| --- | --- | --- | --- | --- |');
-  for(const r of state.stageRuns)lines.push(`| ${cell(r.id)} / ${cell(r.scope)} | ${v(r.stage)} | ${v(r.progress)} | ${v(r.result)} | ${v(r.applicability)} |`);
-  lines.push('',t('## Current work, blockers and next action','## 当前工作、阻塞与下一步'),'',`${t('Current','当前工作')}: ${identifier(state.currentRun)}`,'',`${t('Next','下一步')}: ${cell(state.next.action)}`);
-  for(const r of state.stageRuns.filter(r=>r.progress==='blocked'))lines.push(`- ${t('Blocked','受阻')}: ${cell(r.id)} — ${cell(r.scope)}`);
-  for(const c of state.openChanges.filter(c=>c.status==='open'))lines.push(`- ${t('Open change/question','待处理变更或问题')}: ${link(c.ref)}`);
-  const review=await reviewStatus(directory,state);
-  lines.push('',t('## Document review','## 文档审核'),'',`${t('Review protocol','审核协议')}: ${v(review.compatibility)}`,`${t('Next stage','下一阶段')}: ${v(review.nextStage)}`,'',t('| Document | Version | Review status | Approval record |','| 文档 | 修订 | 审核状态 | 批准记录 |'),'| --- | --- | --- | --- |');
-  for(const d of review.documents)lines.push(`| ${artifactLink(d.path)} | ${cell(d.version)} | ${v(d.status)} | ${identifier(d.approval)} |`);
-  for(const p of review.pending)lines.push(`- ${t('Awaiting review','待审核')}: ${artifactLink(p.document)} (${cell(p.run)}; ${v(p.status)})`);
-  lines.push('',t('Approval records bind content and user decision evidence; the tool does not authenticate the user.','批准记录关联文档内容与用户决定依据；工具不认证用户身份。'),'');
-  const completion=completionStatus(state,review,{changed:await documentChanges(directory,state)}),session=sessionAdvice(directory,state,review);
-  lines.push('',t('## Delivery completeness','## 交付完整性'),'',`${t('Assessment','评估')}: ${v(completion.status)}`,`${t('Standard complete','标准交付完成')}: ${v(completion.standardComplete)}`,...completion.gaps.map(g=>`- ${cell(g)}`),'',t('Historical goal/acceptance values are separate from this assessment.','历史目标与接受记录独立保留，不替代本次完整性评估。'),'',t('## Session suggestions','## 会话建议'),'',t('Requirements → technical/interface/SQL → test cases → plan → each implementation batch with its review → overall review → each verification batch. Only applicable work is grouped; these are context suggestions, not gates.','需求 → 技术设计与适用的接口/SQL → 测试用例 → 实施计划 → 各实施批次及其审查 → 整体审查 → 各验证批次。仅分组适用工作；这是上下文建议，不是额外审批门槛。'),'',...session.groups.map(g=>`- ${cell(g.id)}: ${g.runs.map(cell).join(', ')}`),'',`${t('Next interaction','下一项操作')}: ${v(session.action)}`);
+  const lines=[t('# Delivery progress','# 交付进度'),'',cell(state.goal.summary),'',t('## Current stage and your next action','## 当前阶段与用户操作'),''];
+  lines.push(`${t('Current stage','当前阶段')}: ${v(current?.stage??'requirements preparation')}${current?' · '+progress(current):''}`);
+  for(const d of humanDocs)lines.push(`- ${artifactLink(d.path)} ${cell(d.version)} · ${d.selfCheck?t('Self-check recorded as passed','自检记录通过'):t('Self-check pending','待自检')} · ${v(d.status)}`);
+  lines.push('',`${t('Next action','下一步')}: ${cell(state.next.action)}`);
+  if(session.action==='await-review')lines.push('',t('Review the current document and explicitly approve it or give feedback. Do not start the next stage while review is pending.','请审核当前材料，明确通过或反馈修改；待审期间不进入下一阶段。'));
   if(session.instruction)lines.push('',cell(session.instruction));
-  if(session.continuation)lines.push('',cell(session.continuation));
-  lines.push('',t('## Artifacts and plan','## 成果与计划'),'');
-  const refs=new Set([...(state.documents??[]).map(d=>d.path),...state.stageRuns.flatMap(r=>[...r.outputRefs,r.resultRef].filter(Boolean)),...(state.next.inputRefs??[])]);
-  for(const ref of refs)if(await available(directory,state,ref))lines.push(`- ${artifactLink(ref)}`);
-  lines.push('',t('## Independent outcomes and generation','## 独立结果与生成信息'),'',`${t('Goal','目标')}: ${v(state.outcome.goal)}`,`${t('Acceptance','用户接受')}: ${v(state.outcome.acceptance)}`,`${t('Merge','合并')}: ${state.outcome.mergeRef?link(state.outcome.mergeRef):v(null)}`,`${t('Deployment','部署')}: ${state.outcome.deploymentRef?link(state.outcome.deploymentRef):v(null)}`,'',`${t('Delivery','交付')}: ${state.deliveryId}`,`${t('State revision','状态修订')}: ${state.revision}`,`${t('Rules','规则版本')}: ${state.rulesVersion}`,`${t('State saved','状态保存时间')}: ${state.updatedAt}`,'',t('Matching revisions do not establish document semantics or authorization.','修订一致不代表文档语义或授权已经核实。'),'');
+  const next=suggestedNextStage(state);
+  if(next && current?.progress==='done' && !['resolve-current','finished','assess-outcome'].includes(session.action))lines.push('',`${t('After this stop','当前停点处理后')}: ${v(next)}${session.action==='await-review'?t(' (after approval)','（批准后）'):''}`);
+  const problems=[];
+  if(current && current.progress!=='planned') {
+    if(current.progress==='blocked')problems.push(cell(current.scope));
+    if(currentReview?.blockedBy.length)problems.push(t('Current prerequisites need completion or approval.','当前前置工作需要完成或批准。'));
+    if(failed(current) && !currentReview?.resolvedBy)problems.push(t('Resolve the recorded unsuccessful result before advancing.','请先处理当前未通过的结果，再推进。'));
+    if(['needs-review','unknown'].includes(current.applicability))problems.push(t('Reassess the affected current work.','请复核当前受影响的工作。'));
+  }
+  for(const ref of changed)problems.push(`${t('Changed or missing material','材料已变化或缺失')}: ${artifactLink(ref)}`);
+  for(const c of state.openChanges.filter(c=>c.status==='open'))problems.push(`${t('Open change','待处理变更')}: ${artifactLink(c.ref)}`);
+  if(review.evidenceIssues.length)problems.push(t('Recorded review evidence needs checking.','已记录的审核依据需要核对。'));
+  if(problems.length)lines.push('',t('## Items to resolve','## 当前待处理事项'),'',...problems.map(p=>'- '+p));
+  lines.push('',t('## Delivery progress','## 整体进度'),'',t('| Stage / work | Status |','| 阶段／工作 | 状态 |'),'| --- | --- |');
+  for(const r of state.stageRuns)lines.push(`| ${v(r.stage)} · ${cell(r.scope)} | ${progress(r)} |`);
+  if(!state.deliveryPolicy.partialRef)for(const stage of ['requirements','tech-design','contract','test-design','plan','implement','review','verify','handoff']) {
+    if(state.stageRuns.some(r=>r.stage===stage))continue;
+    if(stage==='contract' && state.documentPolicy.interface==='none' && state.documentPolicy.databases?.length===0)continue;
+    const unknown=stage==='contract' && (state.documentPolicy.interface===null || state.documentPolicy.databases===null);
+    lines.push(`| ${v(stage)} | ${unknown?t('Applicability to be determined during design','待技术设计确认是否适用'):t('Not started','尚未开始')} |`);
+  }
+  lines.push('',`${t('Delivery conclusion','交付结论')}: ${v(completion.status)}`);
+  // Full completion diagnostics matter at handoff, not as a list of early-stage defects.
+  if(current?.stage==='handoff' || state.outcome.goal==='met')lines.push(...completion.gaps.map(g=>'- '+cell(g)));
+  if(state.outcome.acceptance!=='not-recorded')lines.push(`${t('User acceptance','用户验收')}: ${v(state.outcome.acceptance)}`);
+  if(state.outcome.mergeRef)lines.push(`${t('Merge record','合并记录')}: ${artifactLink(state.outcome.mergeRef)}`);
+  if(state.outcome.deploymentRef)lines.push(`${t('Deployment record','部署记录')}: ${artifactLink(state.outcome.deploymentRef)}`);
+  lines.push('',t('## Goal and adopted materials','## 目标与采用材料'),'',`${t('Endpoint','交付终点')}: ${cell(state.goal.endpoint??t('To be confirmed','待确认'))}`);
+  if(state.documentPolicy.interface===null || state.documentPolicy.databases===null)lines.push('',t('Interface/database applicability will be determined during technical design.','接口／数据库适用性待技术设计确认。'));
+  const refs=new Map();
+  const names={testing:t('Test cases and results','用例与结果'),sql:'SQL',prd:t('Requirements','需求依据'),source:t('Source material','来源材料'),prototype:t('Prototype','原型')};
+  for(const d of state.documents)refs.set(d.path,`${names[d.kind]??v(d.kind)} · ${cell(d.version)}`);
+  for(const ref of state.stageRuns.flatMap(r=>[...r.outputRefs,r.resultRef].filter(Boolean)).concat(state.next.inputRefs??[]))if(!refs.has(ref.split('#')[0]))refs.set(ref.split('#')[0],t('Work material','工作材料'));
+  for(const [ref,role] of refs)if(await available(directory,state,ref))lines.push(`- ${role}: ${artifactLink(ref)}`);
+  lines.push('',t('## Continue this delivery','## 接续本次交付'),'',`${t('Delivery directory','交付目录')}: ${cell(path.resolve(directory))}`,'',t('Explicitly activate Aimship in a new session, name this directory and read the saved state and current materials. Resume this stop; “continue” is not approval. A new session is recommended at stage boundaries, but you may continue here.','新会话明确启用 Aimship，指定此目录，读取已保存状态和当前材料，接续本页停点；“继续”不代表批准。阶段边界建议新会话，也可在当前会话继续。'));
+  if(state.repositories.length) {
+    lines.push('',t('## Associated engineering','## 关联工程'),'',t('| Object | Location | Role |','| 工程 | 位置 | 用途 |'),'| --- | --- | --- |');
+    for(const r of state.repositories)lines.push(`| ${cell(r.id)} | ${cell(r.path)} | ${cell(r.role)} |`);
+  }
+  lines.push('',t('## Saved information','## 保存信息'),'',`${t('Delivery','交付')}: ${state.deliveryId}`,`${t('State revision','状态修订')}: ${state.revision}`,`${t('Rules','规则版本')}: ${state.rulesVersion}`,`${t('State saved','状态保存时间')}: ${state.updatedAt}`,'',t('Generated from saved state and document checks. Update the formal records, not this page. Recorded results are not independent proof of execution.','由保存状态和文档检查生成；请更新正式记录，不手改本页。记录结果不等于独立验证了实际执行。'),'');
   return lines.join('\n');
 }
 export async function generateView(directory,state,preserveEdits=false) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aimship",
-  "version": "0.1.0-preview.13",
+  "version": "0.1.0-preview.15",
   "description": "Explicit, goal-driven delivery workflow for coding agents",
   "license": "MIT",
   "type": "module",

package/skills/aimship/SKILL.md

@@ -9,10 +9,11 @@ disable-model-invocation: true
 Activate only when the user explicitly asks to start or resume Aimship. A clear request such as “use Aimship to start/continue” is explicit activation; a passing mention of its name or opening a project is not. In each new session, explicitly activate it again. Ordinary conversation does not create a delivery. Once activated, continue the same delivery across turns without asking the user to invoke every stage.
 
 1. Run `"{{AIMSHIP_NODE}}" "{{AIMSHIP_LAUNCHER}}" bind` to resolve the installed version. Read the returned fixed-version core and that CLI’s help before using its state protocol; cached old-tool schema metadata is not the newly bound protocol. Use that fixed version's tools, carrying its rules version and the current state revision. If this is a source checkout rather than an installed entry, use `node bin/aimship.mjs bind` from the package root.
-2. Read the core at the path returned by `bind`. Resolve all supporting links below against that same fixed release, even if a cached entry mentions an older path. [The shared core](references/core.md) is the source-checkout reference. For an existing delivery, read its state and the current goal/Scope plus only the next step's required references. Do not create a replacement delivery, reset its plan, or infer a new goal from “continue”.
+2. Read the core at the path returned by `bind`. Resolve all supporting links below against that same fixed release, even if a cached entry mentions an older path. [The shared core](references/core.md) is the source-checkout reference. For an existing delivery, read its state and the current goal/PRD plus only the next step's required references. Do not create a replacement delivery, reset its plan, or infer a new goal from “continue”.
 3. Follow the core's [initialization flow](references/core.md#initialization) for new work or interrupted creation. A concrete problem or intended change is enough; no PRD, code location, repository association or known technical conditions are required. Preserve the original request, resolve the same delivery and access, and use init only when state does not exist. New deliveries default to a separate folder under the bound dataRoot; the AI tool workspace or prototype location is not an explicit location choice. If access is needed, have the user add the actual delivery directory or grant access in the AI tool, without copying documents or claiming automatic folder addition. Save the delivery language from the user’s preference or current conversation, as the core specifies. Unknown endpoint/conditions remain unknown, never an inferred authorization or limited scope. Report actual save location, current work and next step. Repeated activation resumes; later code association retains the same delivery ID.
-4. Read the selected [stage reference](references/core.md#stage-references) when reaching it. Explain design choices and unresolved decisions. Follow [document review](references/document-review.md): generate, self-check, give the current document entry/status/review focus and wait; do not send a next-stage continuation prompt while review is pending. After explicit approval save and verify the record, then follow the core session interaction: continue within a group, suggest a new session at its boundary without executing the next group in that response; continuing here needs no new approval; questions, silence and viewing results do not approve. Authorized implementation/review/repair/retest can then continue.
-5. Use the core’s default session groups in existing state. At confirmed saved group boundaries give current results, next suggestion and one continuation line with the actual delivery directory; no extra prompt document. A requested full prompt is optional. On resume, uniquely verify the delivery and actual saved review/unfinished-work stop; never infer approval from the copied entry. Keep a compact binding: delivery ID, absolute delivery directory, state path, current run, rules version, and fixed core/tool paths. After compaction, reload these references if absent; do not assume the full skill survived.
+4. Read the selected [stage reference](references/core.md#stage-references). Work continuously within that stage. On completion and self-check, save its artifacts, current stop and next action, report them and stop. Follow [document review](references/document-review.md): reviewable documents await explicit approval; other stage results await continuation, not a new approval. A user may approve and ask to continue in one message. “Continue”, questions and silence alone do not approve. Do not automatically cross a stage because its sessionGroup is unchanged.
+5. Recommend a new session at a saved stage boundary, without requiring it. On resume, uniquely locate the actual delivery and read its saved review/unfinished-work stop; never infer approval from a copied entry. Keep a compact binding: delivery ID, absolute directory, state path, current run, rules version and fixed core/tool paths. Reload these after compaction if absent. Default to the standard delivery sequence, not a full/design/init choice; respect explicit user limits or pauses.
+
 
 Read [recovery and updates](references/recovery.md) on interruption, version mismatch or missing references; [sources and change flow](references/sources-and-changes.md) when adopting external material or revising reviewed work; [AI tool access](references/hosts.md) only when access or tool setup needs attention. Read [document patterns](references/document-patterns.md) when establishing the artifact arrangement or producing a document. New deliveries keep formal documents at the delivery directory root, source/request.md under source/, and structured state under .aimship/; status.md is the generated reading entry. On resume use the actual statePath returned by read, inspect view/document-change warnings, and explicitly repair supported state as described in recovery. Do not treat a generated view as editable authority.
 

package/skills/aimship/references/artifact-map.json

@@ -16,7 +16,7 @@
         "en": [
           "Document information and sources",
           "Background, goals and non-goals",
-          "Scope, engineering objects and endpoint",
+          "Scope and delivery endpoint",
           "Requirements and behavior",
           "States, interaction and recovery",
           "Acceptance criteria",
@@ -33,38 +33,6 @@
         ]
       }
     },
-    "scope": {
-      "path": "scope.md",
-      "sections": [
-        "info",
-        "goals",
-        "adoption",
-        "exclusions",
-        "decisions",
-        "acceptance",
-        "arrangement"
-      ],
-      "headings": {
-        "en": [
-          "Document information and source versions",
-          "Goal, engineering objects and endpoint",
-          "Source mapping and adopted scope",
-          "Exclusions and constraints",
-          "Conflicts, gaps and supplementary decisions",
-          "Acceptance basis",
-          "Authorization, questions and stage arrangement"
-        ],
-        "zh-CN": [
-          "文档信息与来源",
-          "目标与交付终点",
-          "采用范围与来源",
-          "排除范围",
-          "决定与冲突",
-          "验收标准",
-          "阶段安排"
-        ]
-      }
-    },
     "tech-design": {
       "path": "tech-design.md",
       "sections": [
@@ -262,19 +230,6 @@
     "requirements": {
       "kind": "requirement",
       "section": "requirements",
-      "sectionByKind": {
-        "prd": "requirements",
-        "scope": "adoption"
-      },
-      "humanReview": true
-    },
-    "scope": {
-      "kind": "requirement",
-      "section": "scope",
-      "sectionByKind": {
-        "prd": "scope",
-        "scope": "goals"
-      },
       "humanReview": true
     },
     "prototype": {