@@ -21,8 +21,10 @@ import {
2121 historyDeps ,
2222 lastTurnParts ,
2323 withOwner as withHistoryOwner ,
24+ withReader as withHistoryReader ,
2425 writeTurn ,
2526 type Owner ,
27+ type Reader ,
2628 type Turn ,
2729 type UndoMode ,
2830} from "../utils/historyOwner.js" ;
@@ -54,6 +56,16 @@ const withOwner = <T>(
5456 return task ( owner , turn , projectDir ) ;
5557 } ) ;
5658
59+ const withReader = < T > (
60+ action : string ,
61+ dir : string | undefined ,
62+ task : ( reader : Reader ) => Promise < T > ,
63+ ) =>
64+ withHistoryReader ( dir , ( reader ) => {
65+ trackHistoryAction ( { action, via : reader . via } ) ;
66+ return task ( reader ) ;
67+ } ) ;
68+
5769/** An agent names itself with --who; without it the caller is the person, even during an agent's turn. */
5870const whoOf = ( name : string | undefined ) : HistoryWho => ( name ? { kind : "agent" , name } : YOU ) ;
5971
@@ -138,13 +150,13 @@ function print(json: boolean, data: object, text: string): void {
138150 console . log ( json ? JSON . stringify ( withMeta ( data ) , null , 2 ) : text ) ;
139151}
140152
141- async function textDiff ( owner : Owner , entry : HistoryEntry ) : Promise < string > {
153+ async function textDiff ( reader : Reader , entry : HistoryEntry ) : Promise < string > {
142154 const work = mkdtempSync ( join ( tmpdir ( ) , "hf-history-diff-" ) ) ;
143155 try {
144156 const out : string [ ] = [ ] ;
145157 for ( const file of entry . files ) {
146158 const sides = await Promise . all (
147- [ file . before , file . after ] . map ( ( hash ) => ( hash ? owner . blob ( hash ) : Buffer . alloc ( 0 ) ) ) ,
159+ [ file . before , file . after ] . map ( ( hash ) => ( hash ? reader . blob ( hash ) : Buffer . alloc ( 0 ) ) ) ,
148160 ) ;
149161 if ( sides . some ( ( bytes ) => bytes . subarray ( 0 , 8000 ) . includes ( 0 ) ) ) {
150162 out . push ( `Binary ${ file . path } changed` ) ;
@@ -283,7 +295,10 @@ function guarded<A>(run: (args: A) => Promise<void>) {
283295 error instanceof HistoryIdError ;
284296 if ( ! refused ) throw error ;
285297 setCommandExitCode ( 2 ) ;
286- const { message } = error as Error ;
298+ const message =
299+ error instanceof HistoryBusyError
300+ ? `This project is open in another app (pid ${ error . pid } ), which keeps its history: undo, restore or pin there.`
301+ : ( error as Error ) . message ;
287302 if ( ( args as { json ?: boolean } ) . json ) print ( true , { ok : false , error : message } , message ) ;
288303 else console . error ( message ) ;
289304 }
@@ -316,8 +331,8 @@ const listEntries = async (args: {
316331 json : boolean ;
317332} ) => {
318333 if ( args . _ ?. [ 0 ] ) return ;
319- await withOwner ( "list" , args . dir , async ( owner ) => {
320- const all = await owner . list ( ) ;
334+ await withReader ( "list" , args . dir , async ( reader ) => {
335+ const all = await reader . list ( ) ;
321336 const picked = args . since ? since ( all , args . since , whoOf ( args . who ) ) : all ;
322337 const limit = Number ( args . limit ?? 20 ) ;
323338 if ( ! Number . isInteger ( limit ) || limit < 1 )
@@ -348,13 +363,13 @@ export default defineCommand({
348363 "One entry's files, before and after" ,
349364 { ref : { type : "positional" , required : true } , diff : { type : "boolean" , default : false } } ,
350365 ( args ) =>
351- withOwner ( "show" , args . dir , async ( owner ) => {
352- const entry = entryOf ( await owner . list ( ) , args . ref ) ;
366+ withReader ( "show" , args . dir , async ( reader ) => {
367+ const entry = entryOf ( await reader . list ( ) , args . ref ) ;
353368 const changes = entry . files . map ( ( file ) => ( {
354369 path : file . path ,
355370 change : changeOf ( file ) ,
356371 } ) ) ;
357- const diff = args . diff ? await textDiff ( owner , entry ) : undefined ;
372+ const diff = args . diff ? await textDiff ( reader , entry ) : undefined ;
358373 const marks = changes . map ( ( file ) => ` ${ file . change [ 0 ] ! . toUpperCase ( ) } ${ file . path } ` ) ;
359374 print (
360375 args . json ,
@@ -402,13 +417,13 @@ export default defineCommand({
402417 path : { type : "positional" , required : false } ,
403418 } ,
404419 ( args ) =>
405- withOwner ( "peek" , args . dir , async ( owner ) => {
406- const files = await owner . peek ( pointOf ( await owner . list ( ) , args . ref ) ) ;
420+ withReader ( "peek" , args . dir , async ( reader ) => {
421+ const files = await reader . peek ( pointOf ( await reader . list ( ) , args . ref ) ) ;
407422 if ( ! files ) throw new Refusal ( "That point is no longer kept" ) ;
408423 if ( ! args . path ) return print ( args . json , { files } , Object . keys ( files ) . join ( "\n" ) ) ;
409424 const hash = files [ args . path ] ;
410425 if ( ! hash ) throw new Refusal ( `${ args . path } did not exist then` ) ;
411- process . stdout . write ( await owner . blob ( hash ) ) ;
426+ process . stdout . write ( await reader . blob ( hash ) ) ;
412427 } ) ,
413428 ) ,
414429 pin : ( ) =>
0 commit comments