@rexvane/piweb 0.3.16 → 0.3.18

package/src/lib/types.ts

@@ -25,7 +25,6 @@ export interface TrajTokens {
 	output?: number;
 	cacheRead?: number;
 	cacheWrite?: number;
-	totalTokens?: number;
 }
 
 export interface TrajEntry {
@@ -116,7 +115,6 @@ export type WebEvent =
 	| { type: "traj"; entry: TrajEntry; ts: number }
 	| { type: "name"; name: string; ts: number }
 	| { type: "tools"; active: string[]; all: string[]; toolPreset?: ToolPreset; customActiveTools?: string[] | null; ts: number }
-	| { type: "workflow"; workflow: WorkflowState; ts: number }
 	| {
 			/** 资源（扩展/技能/模板/命令）重载后的新清单；前端据此刷新 / 菜单与设置面板 */
 			type: "resources";
@@ -146,10 +144,8 @@ export type WebEvent =
 	| { type: "error"; message: string; ts: number }
 	/** 自动重试：流程内通知，界面聚合成一条「重试 n/max」，不作为错误条目累积 */
 	| { type: "retry"; attempt: number; maxAttempts: number; message: string; ts: number }
-	/** 项目生长：记录了一步（工具结束 / 回合结束 / 外部修改 / 会话基线） */
-	| { type: "growth"; step: GrowthStep; ts: number }
-	/** 项目生长：改盘类工具运行期间目录监听看到的新路径（累计；空数组 = 清空） */
-	| { type: "growth_pending"; paths: string[]; ts: number }
+	/** 项目生长：提交了一个 commit（pi 的一轮 / 用户两轮之间的修改 / 工作区基线） */
+	| { type: "growth"; round: GrowthRound; ts: number }
 	| { type: "growth_error"; message: string | null; ts: number };
 
 export interface WebStats {
@@ -167,9 +163,11 @@ export interface WebStats {
 	decodeTokens: number;
 }
 
-// ---------- 项目生长（影子仓库快照） ----------
+// ---------- 项目生长（每轮一个 git commit） ----------
 
-export type GrowthStepKind = "baseline" | "tool" | "turn" | "external" | "manual";
+/** round = pi 的一轮；user = 用户在两轮之间自己的修改；baseline = 工作区第一个 commit（起点，不算一轮） */
+export type GrowthRoundKind = "round" | "user" | "baseline";
+export type GrowthRoundStatus = "done" | "aborted" | "error";
 
 export interface GrowthChange {
 	status: "A" | "M" | "D" | "R";
@@ -182,26 +180,31 @@ export interface GrowthChange {
 	binary?: boolean;
 }
 
-export interface GrowthStep {
-	/** 工作区内单调递增 */
-	seq: number;
+/**
+ * refs/piweb/rounds/<key> 链上的一个 commit。元信息全部来自 commit 本身（标题 + Piweb-* trailers），
+ * 变更清单与行数来自 git log --raw --numstat（相对上一个 commit）。
+ */
+export interface GrowthRound {
+	commit: string;
+	/** 上一个 commit；链上第一个 commit 为 null */
+	parent: string | null;
+	tree: string;
+	/** 上一个 commit 的 tree（链上第一个 commit 为空树）：本轮改动 = git diff parentTree tree */
+	parentTree: string;
+	/** 提交时间（毫秒） */
 	ts: number;
-	/** 触发这一步的会话（JSONL 绝对路径） */
+	kind: GrowthRoundKind;
+	/** round：本轮提问首行；其余类型为空 */
+	title: string;
+	/** 所属会话的 JSONL 文件名（不含目录） */
 	session: string;
-	kind: GrowthStepKind;
-	/** 「bash · mkdir -p src」这样的一句标签 */
-	label: string;
-	/** 这一步之后的 tree 哈希 */
-	tree: string;
-	/** 这一步之前的 tree 哈希（工作区首张快照为 empty tree） */
-	parent: string;
-	commit?: string;
-	toolCallId?: string;
-	toolName?: string;
-	/** 相对上一步的变更（超过上限时截断，truncated=true） */
+	/** 本轮的用户消息 entryId（对话里的提问与这一轮互相跳转用） */
+	promptIds: string[];
+	status: GrowthRoundStatus;
+	/** 相对上一个 commit 的变更（超过上限时截断，truncated=true） */
 	changes: GrowthChange[];
 	truncated?: boolean;
-	/** 工作区的第一张快照：全部文件都是新增，账本里不存清单 */
+	/** 链上第一个 commit：没有上一版可比，不列变更 */
 	initial?: boolean;
 	stats: { added: number; modified: number; deleted: number; renamed: number; add: number; del: number };
 }
@@ -267,7 +270,6 @@ export interface WebSnapshot {
 	thinkingLevel?: string;
 	thinkingLevels: string[];
 	toolPreset: ToolPreset;
-	workflow: WorkflowState;
 	/** custom 白名单优先于 preset；null 表示使用 preset，省略兼容旧服务端。 */
 	customActiveTools?: string[] | null;
 	/** 当前待应答的扩展请求；快照是权威集合，不重放已答请求。 */
@@ -284,14 +286,6 @@ export interface WebSnapshot {
 
 export type ToolPreset = "readonly" | "standard" | "full";
 
-export type WorkflowMode = "agent" | "plan" | "goal";
-export interface WorkflowState {
-	mode: WorkflowMode;
-	planStatus: "idle" | "planning" | "ready" | "executing";
-	planId?: string;
-	goal: string;
-}
-
 export interface ImageAttachment {
 	type: "image";
 	data: string;
@@ -309,8 +303,6 @@ export interface AgentCommand {
 		| "setModel"
 		| "setThinkingLevel"
 		| "setToolPreset"
-		| "setWorkflowMode"
-		| "approvePlan"
 		| "rename"
 		| "fork"
 		| "cycleModel"
@@ -327,7 +319,6 @@ export interface AgentCommand {
 	modelId?: string;
 	level?: string;
 	preset?: ToolPreset;
-	mode?: WorkflowMode;
 	entryId?: string;
 	behavior?: "steer" | "followUp";
 	direction?: "forward" | "backward";

package/tsconfig.json

@@ -44,6 +44,7 @@
     ".next-releases",
     "pi",
     "dsh",
-    "bin"
+    "bin",
+    "backups"
   ]
 }

package/.next/server/app/api/swarm/[id]/route.js

@@ -1 +0,0 @@
-"use strict";(()=>{var a={};a.id=664,a.ids=[664],a.modules={261:a=>{a.exports=require("next/dist/shared/lib/router/utils/app-paths")},3295:a=>{a.exports=require("next/dist/server/app-render/after-task-async-storage.external.js")},8128:a=>{a.exports=require("next/dist/server/runtime-reacts.external.js")},10846:a=>{a.exports=require("next/dist/compiled/next-server/app-page.runtime.prod.js")},19121:a=>{a.exports=require("next/dist/server/app-render/action-async-storage.external.js")},29294:a=>{a.exports=require("next/dist/server/app-render/work-async-storage.external.js")},31421:a=>{a.exports=require("node:child_process")},37270:(a,b,c)=>{c.r(b),c.d(b,{handler:()=>z,patchFetch:()=>y,routeModule:()=>u,serverHooks:()=>x,workAsyncStorage:()=>v,workUnitAsyncStorage:()=>w});var d=c(19225),e=c(84006),f=c(8317),g=c(99373),h=c(34775),i=c(24235),j=c(261),k=c(54365),l=c(90771),m=c(73461),n=c(67798),o=c(92280),p=c(62018),q=c(45696),r=c(47929),s=c(86439),t=c(37527);let u=new d.AppRouteRouteModule({definition:{kind:e.RouteKind.APP_ROUTE,page:"/api/swarm/[id]/route",pathname:"/api/swarm/[id]",filename:"route",bundlePath:"app/api/swarm/[id]/route"},distDir:".next",relativeProjectDir:"",resolvedPagePath:"/home/runner/work/PiWeb/PiWeb/src/app/api/swarm/[id]/route.ts",nextConfigOutput:"",userland:()=>c(45188),...{}}),{workAsyncStorage:v,workUnitAsyncStorage:w,serverHooks:x}=u;function y(){return(0,f.patchFetch)({workAsyncStorage:v,workUnitAsyncStorage:w})}async function z(a,b,c){c.requestMeta&&(0,g.setRequestMeta)(a,c.requestMeta),u.isDev&&(0,g.addRequestMeta)(a,"devRequestTimingInternalsEnd",process.hrtime.bigint());let d="/api/swarm/[id]/route";"/index"===d&&(d="/");let f=await u.prepare(a,b,{srcPage:d,multiZoneDraftMode:!1});if(!f)return b.statusCode=400,b.end("Bad Request"),null==c.waitUntil||c.waitUntil.call(c,Promise.resolve()),null;let{buildId:v,deploymentId:w,params:x,nextConfig:y,parsedUrl:z,isDraftMode:A,prerenderManifest:B,routerServerContext:C,isOnDemandRevalidate:D,revalidateOnlyGenerated:E,resolvedPathname:F,clientReferenceManifest:G,serverActionsManifest:H}=f,I=(0,j.normalizeAppPath)(d),J=!!(B.dynamicRoutes[I]||B.routes[F]),K=async()=>((null==C?void 0:C.render404)?await C.render404(a,b,z,!1):b.end("This page could not be found"),null);if(J&&!A){let a=!!B.routes[F],b=B.dynamicRoutes[I];if(b&&!1===b.fallback&&!a){if(y.adapterPath)return await K();throw new s.NoFallbackError}}let L=null;!J||u.isDev||A||(L="/index"===(L=F)?"/":L);let M=!0===u.isDev||!J,N=J&&!M;H&&G&&(0,i.setManifestsSingleton)({page:d,clientReferenceManifest:G,serverActionsManifest:H});let O=a.method||"GET",P=(0,h.getTracer)(),Q=P.getActiveScopeSpan(),R=!!(null==C?void 0:C.isWrappedByNextServer),S=!!(0,g.getRequestMeta)(a,"minimalMode"),T=(0,g.getRequestMeta)(a,"incrementalCache")||await u.getIncrementalCache(a,y,B,S);null==T||T.resetRequestCache(),globalThis.__incrementalCache=T;let U={params:x,previewProps:B.preview,renderOpts:{experimental:{authInterrupts:!!y.experimental.authInterrupts,useCacheTimeout:y.experimental.useCacheTimeout},cacheComponents:!!y.cacheComponents,validationLevel:y.experimental.instantInsights.validationLevel,supportsDynamicResponse:M,incrementalCache:T,hmrRefreshHash:(0,g.getRequestMeta)(a,"hmrRefreshHash"),cacheLifeProfiles:y.cacheLife,staticPageGenerationTimeout:y.staticPageGenerationTimeout,waitUntil:c.waitUntil,onClose:a=>{b.on("close",a)},onAfterTaskError:void 0,onInstrumentationRequestError:(b,c,d,e)=>u.onRequestError(a,b,d,e,C)},sharedContext:{buildId:v,deploymentId:w}},V=new k.NodeNextRequest(a),W=new k.NodeNextResponse(b),X=l.NextRequestAdapter.fromNodeNextRequest(V,(0,l.signalFromNodeResponse)(b)),Y=async({previousCacheEntry:e})=>{try{if(!S&&D&&E&&!e)return b.statusCode=404,b.setHeader("x-nextjs-cache","REVALIDATED"),b.end("This page could not be found"),null;let d=await u.handle(X,U);a.fetchMetrics=U.renderOpts.fetchMetrics;let f=U.renderOpts.pendingWaitUntil;f&&c.waitUntil&&(c.waitUntil(f),f=void 0);let g=U.renderOpts.collectedTags;if(!J)return await (0,o.I)(V,W,d,f),null;{let a=await d.blob(),b=(0,p.toNodeOutgoingHttpHeaders)(d.headers);g&&(b[r.NEXT_CACHE_TAGS_HEADER]=g),!b["content-type"]&&a.type&&(b["content-type"]=a.type);let c=void 0!==U.renderOpts.collectedRevalidate&&!(U.renderOpts.collectedRevalidate>=r.INFINITE_CACHE)&&U.renderOpts.collectedRevalidate,e=void 0===U.renderOpts.collectedExpire||U.renderOpts.collectedExpire>=r.INFINITE_CACHE?!1!==c&&c>0?y.expireTime:void 0:U.renderOpts.collectedExpire;return{value:{kind:t.CachedRouteKind.APP_ROUTE,status:d.status,body:Buffer.from(await a.arrayBuffer()),headers:b},cacheControl:{revalidate:c,expire:e}}}}catch(b){throw(null==e?void 0:e.isStale)&&await u.onRequestError(a,b,{routerKind:"App Router",routePath:d,routeType:"route",revalidateReason:(0,n.getRevalidateReason)({isStaticGeneration:N,isOnDemandRevalidate:D})},!1,C),b}},Z=async(d,f)=>{try{var g,i;let d=await u.handleResponse({req:a,nextConfig:y,cacheKey:L,routeKind:e.RouteKind.APP_ROUTE,isFallback:!1,prerenderManifest:B,isRoutePPREnabled:!1,isOnDemandRevalidate:D,revalidateOnlyGenerated:E,responseGenerator:Y,waitUntil:c.waitUntil,isMinimalMode:S});if(!J)return;if((null==d||null==(g=d.value)?void 0:g.kind)!==t.CachedRouteKind.APP_ROUTE)throw Object.defineProperty(Error(`Invariant: app-route received invalid cache entry ${null==d||null==(i=d.value)?void 0:i.kind}`),"__NEXT_ERROR_CODE",{value:"E701",enumerable:!1,configurable:!0});S||b.setHeader("x-nextjs-cache",D?"REVALIDATED":d.isMiss?"MISS":d.isStale?"STALE":"HIT"),A&&b.setHeader("Cache-Control","private, no-cache, no-store, max-age=0, must-revalidate");let f=(0,p.fromNodeOutgoingHttpHeaders)(d.value.headers);S&&J||f.delete(r.NEXT_CACHE_TAGS_HEADER),!d.cacheControl||b.getHeader("Cache-Control")||f.get("Cache-Control")||f.set("Cache-Control",(0,q.getCacheControlHeader)(d.cacheControl)),await (0,o.I)(V,W,new Response(d.value.body,{headers:f,status:d.value.status||200}));return}catch(b){if(b instanceof s.NoFallbackError||await u.onRequestError(a,b,{routerKind:"App Router",routePath:I,routeType:"route",revalidateReason:(0,n.getRevalidateReason)({isStaticGeneration:N,isOnDemandRevalidate:D})},!1,C),J)throw b;await (0,o.I)(V,W,new Response(null,{status:500}));return}finally{(()=>{if(!d)return;let a=b.statusCode;d.setAttributes({"http.status_code":a,"next.rsc":!1}),a&&a>=500&&(d.setStatus({code:h.SpanStatusCode.ERROR}),d.setAttribute("error.type",a.toString()));let c=P.getRootSpanAttributes();if(!c)return;if(c.get("next.span_type")!==m.BaseServerSpan.handleRequest)return console.warn(`Unexpected root span type '${c.get("next.span_type")}'. Please report this Next.js issue https://github.com/vercel/next.js`);let e=c.get("next.route")||I,g=`${O} ${e}`;d.setAttributes({"next.route":e,"http.route":e,"next.span_name":g}),d.updateName(g),f&&f!==d&&(f.setAttribute("http.route",e),f.updateName(g))})()}};if(R&&Q)await Z(Q,void 0);else{let b=P.getActiveScopeSpan();await P.withPropagatedContext(a.headers,()=>P.trace(m.BaseServerSpan.handleRequest,{spanName:`${O} ${d}`,kind:h.SpanKind.SERVER,attributes:{"http.method":O,"http.target":a.url}},a=>Z(a,b)),void 0,!R)}}},44870:a=>{a.exports=require("next/dist/compiled/next-server/app-route.runtime.prod.js")},45188:(a,b,c)=>{c.a(a,async(a,d)=>{try{c.r(b),c.d(b,{GET:()=>i,POST:()=>j,dynamic:()=>k});var e=c(23211),f=c(62433),g=c(4411),h=a([f,g]);[f,g]=h.then?(await h)():h;let k="force-dynamic";async function i(a,{params:b}){try{return e.NextResponse.json({success:!0,data:await (0,g.ZO)((await b).id)})}catch(a){return e.NextResponse.json({success:!1,error:String(a.message??a)},{status:a instanceof f.BV?400:500})}}async function j(a,{params:b}){try{let c=await a.json(),d=(await b).id,h=c?.action==="cancel"?await (0,g.d2)(d,c?.cwd):c?.action==="accept"?await (0,g.C7)(d,c?.index,c?.cwd):(()=>{throw new f.BV("invalid swarm action")})();return e.NextResponse.json({success:!0,data:h})}catch(a){return e.NextResponse.json({success:!1,error:String(a.message??a)},{status:a instanceof f.BV||a instanceof SyntaxError?400:500})}}d()}catch(a){d(a)}})},51455:a=>{a.exports=require("node:fs/promises")},57975:a=>{a.exports=require("node:util")},63033:a=>{a.exports=require("next/dist/server/app-render/work-unit-async-storage.external.js")},73024:a=>{a.exports=require("node:fs")},75430:a=>{a.exports=import("@earendil-works/pi-coding-agent")},76760:a=>{a.exports=require("node:path")},77598:a=>{a.exports=require("node:crypto")},86439:a=>{a.exports=require("next/dist/shared/lib/no-fallback-error.external")}};var b=require("../../../../webpack-runtime.js");b.C(a);var c=b.X(0,[741,813,757,775],()=>b(b.s=37270));module.exports=c})();