andras/reconcile
1
0
Fork 0
Code Issues Pull requests 5 Projects Releases Packages Wiki Activity Actions

Fix agent behaviour

Browse source
This commit is contained in:
Andras Schmelczer 2025-02-23 16:45:52 +00:00
parent b4783d1007
commit c69f84edf5
No known key found for this signature in database
GPG key ID: FC8F2C3D3D1A718C
4 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
View file

@ -1,5 +1,5 @@
import type { FileSystemOperations } from "dist/types";
import type { RelativePath } from "src/persistence/database";
import type { FileSystemOperations } from "./filesystem-operations";
export class FileNotFoundError extends Error {
public constructor(message: string) {

1
frontend/sync-client/src/services/sync-service.ts
View file

@ -8,7 +8,6 @@ import type {
} from "../persistence/database";
import type { Logger } from "src/tracing/logger";
import { retriedFetchFactory } from "src/utils/retried-fetch";
import type { SyncSettings } from "dist/types";
import type { Settings } from "src/persistence/settings";
export interface CheckConnectionResult {

1
frontend/sync-client/src/sync-operations/syncer.ts
View file

@ -206,6 +206,7 @@ export class Syncer {
await this.operations.read(relativePath);
const contentHash = hash(contentBytes);
// todo: make this smarter so that offline files can be renamed & edited at the same time
const originalFile = findMatchingFileBasedOnHash(
contentHash,
locallyPossiblyDeletedFiles

15
frontend/test-client/src/agent/mock-agent.ts
View file

@ -224,6 +224,16 @@ export class MockAgent extends MockClient {
private async renameFileAction(files: RelativePath[]): Promise<void> {
const file = choose(files);
// We can't edit files offline that have been renamed while offline.
// Otherwise, the resolution logic couldn't handle it.
if (this.doNotTouch.includes(file)) {
this.client.logger.info(
`Skipping file ${file} because it has been updated while offline`
);
return;
}
const newName = this.getFileName();
if (await this.exists(newName)) {
@ -242,7 +252,7 @@ export class MockAgent extends MockClient {
const file = choose(files);
// We can't edit files offline that have been renamed while offline.
// Othwersie, the resolution logic couldn't handle it.
// Otherwise, the resolution logic couldn't handle it.
if (this.doNotTouch.includes(file)) {
this.client.logger.info(
`Skipping file ${file} because it has been renamed while offline`
@ -254,6 +264,9 @@ export class MockAgent extends MockClient {
this.client.logger.info(
`Decided to update file ${file} with ${content}`
);
if (!this.client.settings.getSettings().isSyncEnabled) {
this.doNotTouch.push(file);
}
await this.atomicUpdateText(file, (old) => old + ` |${content}| `);
}