@gadgetinc/ggt 0.4.7 → 0.4.9

package/lib/services/filesync/changes.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/filesync/changes.ts"],"sourcesContent":["import chalk from \"chalk\";\nimport pluralize from \"pluralize\";\nimport { config } from \"../config/config.js\";\nimport { Level } from \"../output/log/level.js\";\nimport { createLogger } from \"../output/log/logger.js\";\nimport type { PrintTableOptions } from \"../output/log/printer.js\";\nimport { sprint } from \"../output/sprint.js\";\nimport { isNever, isString } from \"../util/is.js\";\n\nconst log = createLogger({ name: \"changes\" });\n\nexport type Create = { type: \"create\"; oldPath?: string };\nexport type Update = { type: \"update\" };\nexport type Delete = { type: \"delete\" };\nexport type Change = Create | Update | Delete;\n\nexport class Changes extends Map<string, Change> {\n  created(): string[] {\n    return Array.from(this.entries())\n      .filter(([, change]) => change.type === \"create\")\n      .map(([path]) => path);\n  }\n\n  updated(): string[] {\n    return Array.from(this.entries())\n      .filter(([, change]) => change.type === \"update\")\n      .map(([path]) => path);\n  }\n\n  deleted(): string[] {\n    return Array.from(this.entries())\n      .filter(([, change]) => change.type === \"delete\")\n      .map(([path]) => path);\n  }\n}\n\n/**\n * Prints the changes to the console.\n *\n * @param changes - The changes to print.\n * @param tense - The tense to use for the change type.\n * @param limit - The maximum number of changes to print.\n */\nexport const printChanges = ({\n  changes,\n  tense,\n  limit = Infinity,\n  ...tableOptions\n}: {\n  changes: Changes;\n  tense: \"past\" | \"present\";\n  limit?: number;\n} & Partial<PrintTableOptions>): void => {\n  if (config.logLevel <= Level.TRACE) {\n    // print all changes when tracing\n    limit = Infinity;\n  }\n\n  const renamed = chalk.yellowBright((tense === \"past\" ? \"renamed\" : \"rename\") + \" →\");\n  const created = chalk.greenBright((tense === \"past\" ? \"created\" : \"create\") + \" +\");\n  const updated = chalk.blueBright((tense === \"past\" ? \"updated\" : \"update\") + \" ±\");\n  const deleted = chalk.redBright((tense === \"past\" ? \"deleted\" : \"delete\") + \" -\");\n\n  const rows = Array.from(changes.entries())\n    .sort((a, b) => a[0].localeCompare(b[0]))\n    .slice(0, limit)\n    .map(([path, change]) => {\n      switch (true) {\n        case change.type === \"create\" && isString(change.oldPath):\n          return [chalk.yellowBright(change.oldPath), renamed, chalk.yellowBright(path)];\n        case change.type === \"create\":\n          return [chalk.greenBright(path), created];\n        case change.type === \"update\":\n          return [chalk.blueBright(path), updated];\n        case change.type === \"delete\":\n          return [chalk.redBright(path), deleted];\n        default:\n          return isNever(change);\n      }\n    });\n\n  if (changes.size > limit) {\n    rows.push([sprint`{gray … ${changes.size - limit} more}`, \"\"]);\n  }\n\n  let footer: string | undefined;\n  if (changes.size >= 10) {\n    tableOptions.spaceY = 1;\n\n    footer = sprint`${pluralize(\"change\", changes.size, true)} in total. `;\n\n    const breakdown = [];\n\n    const created = changes.created();\n    if (created.length > 0) {\n      breakdown.push(sprint`{greenBright ${pluralize(\"create\", created.length, true)}}`);\n    }\n\n    const updated = changes.updated();\n    if (updated.length > 0) {\n      breakdown.push(sprint`{blueBright ${pluralize(\"update\", updated.length, true)}}`);\n    }\n\n    const deleted = changes.deleted();\n    if (deleted.length > 0) {\n      breakdown.push(sprint`{redBright ${pluralize(\"delete\", deleted.length, true)}}`);\n    }\n\n    footer += breakdown.join(\", \");\n    footer += \".\";\n  }\n\n  log.printTable({ rows, footer, ...tableOptions });\n};\n"],"names":["chalk","pluralize","config","Level","createLogger","sprint","isNever","isString","log","name","Changes","Map","created","Array","from","entries","filter","change","type","map","path","updated","deleted","printChanges","changes","tense","limit","Infinity","tableOptions","logLevel","TRACE","renamed","yellowBright","greenBright","blueBright","redBright","rows","sort","a","b","localeCompare","slice","oldPath","size","push","footer","spaceY","breakdown","length","join","printTable"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/filesync/changes.ts"],"sourcesContent":["import chalk from \"chalk\";\nimport pluralize from \"pluralize\";\nimport type { Context } from \"../command/context.js\";\nimport { config } from \"../config/config.js\";\nimport { Level } from \"../output/log/level.js\";\nimport type { PrintTableOptions } from \"../output/log/printer.js\";\nimport { sprint } from \"../output/sprint.js\";\nimport { isNever, isString } from \"../util/is.js\";\n\nexport type Create = { type: \"create\"; oldPath?: string };\nexport type Update = { type: \"update\" };\nexport type Delete = { type: \"delete\" };\nexport type Change = Create | Update | Delete;\n\nexport class Changes extends Map<string, Change> {\n  created(): string[] {\n    return Array.from(this.entries())\n      .filter(([, change]) => change.type === \"create\")\n      .map(([path]) => path);\n  }\n\n  updated(): string[] {\n    return Array.from(this.entries())\n      .filter(([, change]) => change.type === \"update\")\n      .map(([path]) => path);\n  }\n\n  deleted(): string[] {\n    return Array.from(this.entries())\n      .filter(([, change]) => change.type === \"delete\")\n      .map(([path]) => path);\n  }\n}\n\n/**\n * Prints the changes to the console.\n *\n * @param ctx - The current context.\n * @param options - The options to use.\n * @param options.changes - The changes to print.\n * @param options.tense - The tense to use for the change type.\n * @param options.limit - The maximum number of changes to print.\n */\nexport const printChanges = (\n  ctx: Context,\n  {\n    changes,\n    tense,\n    limit = Infinity,\n    ...tableOptions\n  }: {\n    changes: Changes;\n    tense: \"past\" | \"present\";\n    limit?: number;\n  } & Partial<PrintTableOptions>,\n): void => {\n  if (config.logLevel <= Level.TRACE) {\n    // print all changes when tracing\n    limit = Infinity;\n  }\n\n  const renamed = chalk.yellowBright((tense === \"past\" ? \"renamed\" : \"rename\") + \" →\");\n  const created = chalk.greenBright((tense === \"past\" ? \"created\" : \"create\") + \" +\");\n  const updated = chalk.blueBright((tense === \"past\" ? \"updated\" : \"update\") + \" ±\");\n  const deleted = chalk.redBright((tense === \"past\" ? \"deleted\" : \"delete\") + \" -\");\n\n  const rows = Array.from(changes.entries())\n    .sort((a, b) => a[0].localeCompare(b[0]))\n    .slice(0, limit)\n    .map(([path, change]) => {\n      switch (true) {\n        case change.type === \"create\" && isString(change.oldPath):\n          return [chalk.yellowBright(change.oldPath), renamed, chalk.yellowBright(path)];\n        case change.type === \"create\":\n          return [chalk.greenBright(path), created];\n        case change.type === \"update\":\n          return [chalk.blueBright(path), updated];\n        case change.type === \"delete\":\n          return [chalk.redBright(path), deleted];\n        default:\n          return isNever(change);\n      }\n    });\n\n  if (changes.size > limit) {\n    rows.push([sprint`{gray … ${changes.size - limit} more}`, \"\"]);\n  }\n\n  let footer: string | undefined;\n  if (changes.size >= 10) {\n    tableOptions.spaceY = 1;\n\n    footer = sprint`${pluralize(\"change\", changes.size, true)} in total. `;\n\n    const breakdown = [];\n\n    const created = changes.created();\n    if (created.length > 0) {\n      breakdown.push(sprint`{greenBright ${pluralize(\"create\", created.length, true)}}`);\n    }\n\n    const updated = changes.updated();\n    if (updated.length > 0) {\n      breakdown.push(sprint`{blueBright ${pluralize(\"update\", updated.length, true)}}`);\n    }\n\n    const deleted = changes.deleted();\n    if (deleted.length > 0) {\n      breakdown.push(sprint`{redBright ${pluralize(\"delete\", deleted.length, true)}}`);\n    }\n\n    footer += breakdown.join(\", \");\n    footer += \".\";\n  }\n\n  ctx.log.printTable({ rows, footer, ...tableOptions });\n};\n"],"names":["chalk","pluralize","config","Level","sprint","isNever","isString","Changes","Map","created","Array","from","entries","filter","change","type","map","path","updated","deleted","printChanges","ctx","changes","tense","limit","Infinity","tableOptions","logLevel","TRACE","renamed","yellowBright","greenBright","blueBright","redBright","rows","sort","a","b","localeCompare","slice","oldPath","size","push","footer","spaceY","breakdown","length","join","log","printTable"],"mappings":"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"}

package/lib/services/filesync/conflicts.js

@@ -1,9 +1,5 @@
 import chalk from "chalk";
-import { createLogger } from "../output/log/logger.js";
 import { ChangesWithHash, isEqualHash } from "./hashes.js";
-const log = createLogger({
-    name: "conflicts"
-});
 /**
  * A map of conflicting changes made between the user's local filesystem
  * and Gadget's filesystem where the key is the path of the conflicting
@@ -46,9 +42,10 @@ const log = createLogger({
  * Returns a new `Changes` object that contains only the changes that do
  * not have conflicts.
  *
- * @param conflicts - The conflicts to check against.
- * @param changes - The changes to filter.
- * @returns A new `Changes` object without conflicts.
+ * @param options - The options to use.
+ * @param options.conflicts - The conflicts to check against.
+ * @param options.changes - The changes to filter.
+ * @returns A new {@linkcode Changes} object without conflicts.
  */ export const withoutConflictingChanges = ({ conflicts, changes })=>{
     const changesWithoutConflicts = new ChangesWithHash(changes);
     for (const [filepath] of changesWithoutConflicts){
@@ -60,11 +57,16 @@ const log = createLogger({
 };
 /**
  * Prints a table of conflicts between local changes and gadget changes.
- */ export const printConflicts = ({ message, conflicts })=>{
+ *
+ * @param ctx - The current context.
+ * @param options - The options to use.
+ * @param options.message - The message to print above the table.
+ * @param options.conflicts - The conflicts to print.
+ */ export const printConflicts = (ctx, { message, conflicts })=>{
     const created = chalk.greenBright("+ created");
     const updated = chalk.blueBright("± updated");
     const deleted = chalk.redBright("- deleted");
-    log.printTable({
+    ctx.log.printTable({
         message,
         colAligns: [
             "left",

package/lib/services/filesync/conflicts.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/filesync/conflicts.ts"],"sourcesContent":["import chalk from \"chalk\";\nimport { createLogger } from \"../output/log/logger.js\";\nimport { ChangesWithHash, isEqualHash, type ChangeWithHash } from \"./hashes.js\";\n\nconst log = createLogger({ name: \"conflicts\" });\n\n/**\n * A map of conflicting changes made between the user's local filesystem\n * and Gadget's filesystem where the key is the path of the conflicting\n * file and the value is an object containing the conflicting changes.\n */\nexport class Conflicts extends Map<string, { localChange: ChangeWithHash; gadgetChange: ChangeWithHash }> {}\n\n/**\n * Returns the conflicting changes between the user's local filesystem\n * and Gadget's filesystem.\n */\nexport const getConflicts = ({\n  localChanges,\n  gadgetChanges,\n}: {\n  localChanges: ChangesWithHash;\n  gadgetChanges: ChangesWithHash;\n}): Conflicts => {\n  const conflicts = new Conflicts();\n\n  for (const [filepath, localChange] of localChanges) {\n    const gadgetChange = gadgetChanges.get(filepath);\n    if (!gadgetChange) {\n      // gadget doesn't have this change, so there's no conflict\n      continue;\n    }\n\n    if (localChange.type === \"delete\" && gadgetChange.type === \"delete\") {\n      // local and gadget both deleted the same file\n      continue;\n    }\n\n    if (\n      \"targetHash\" in localChange &&\n      \"targetHash\" in gadgetChange &&\n      isEqualHash(filepath, localChange.targetHash, gadgetChange.targetHash)\n    ) {\n      // local and gadget both created/updated the same file with the same content\n      continue;\n    }\n\n    // local and gadget both updated the same file with different\n    // content or one updated and the other deleted\n    conflicts.set(filepath, { localChange, gadgetChange });\n  }\n\n  // ignore .gadget/ file conflicts and always use gadget's version\n  // since gadget is the source of truth for .gadget/ files\n  for (const filepath of conflicts.keys()) {\n    if (filepath.startsWith(\".gadget/\")) {\n      conflicts.delete(filepath);\n    }\n  }\n\n  return conflicts;\n};\n\n/**\n * Returns a new `Changes` object that contains only the changes that do\n * not have conflicts.\n *\n * @param conflicts - The conflicts to check against.\n * @param changes - The changes to filter.\n * @returns A new `Changes` object without conflicts.\n */\nexport const withoutConflictingChanges = ({ conflicts, changes }: { conflicts: Conflicts; changes: ChangesWithHash }): ChangesWithHash => {\n  const changesWithoutConflicts = new ChangesWithHash(changes);\n\n  for (const [filepath] of changesWithoutConflicts) {\n    if (conflicts.has(filepath)) {\n      changesWithoutConflicts.delete(filepath);\n    }\n  }\n\n  return changesWithoutConflicts;\n};\n\n/**\n * Prints a table of conflicts between local changes and gadget changes.\n */\nexport const printConflicts = ({ message, conflicts }: { message: string; conflicts: Conflicts }): void => {\n  const created = chalk.greenBright(\"+ created\");\n  const updated = chalk.blueBright(\"± updated\");\n  const deleted = chalk.redBright(\"- deleted\");\n\n  log.printTable({\n    message,\n    colAligns: [\"left\", \"center\", \"center\"],\n    headers: [\"\", \"You\", \"Gadget\"],\n    spaceY: 1,\n    rows: Array.from(conflicts.entries())\n      .sort((a, b) => a[0].localeCompare(b[0]))\n      .map(([path, { localChange, gadgetChange }]) => {\n        switch (true) {\n          case localChange.type === \"create\" && gadgetChange.type === \"create\":\n            return [path, created, created];\n          case localChange.type === \"create\" && gadgetChange.type === \"update\":\n            return [path, created, updated];\n          case localChange.type === \"create\" && gadgetChange.type === \"delete\":\n            return [path, created, deleted];\n          case localChange.type === \"update\" && gadgetChange.type === \"create\":\n            return [path, updated, created];\n          case localChange.type === \"update\" && gadgetChange.type === \"update\":\n            return [path, updated, updated];\n          case localChange.type === \"update\" && gadgetChange.type === \"delete\":\n            return [path, updated, deleted];\n          case localChange.type === \"delete\" && gadgetChange.type === \"create\":\n            return [path, deleted, created];\n          case localChange.type === \"delete\" && gadgetChange.type === \"update\":\n            return [path, deleted, updated];\n          default:\n            throw new Error(`Unexpected conflict: ${localChange.type} vs ${gadgetChange.type}`);\n        }\n      }),\n  });\n};\n"],"names":["chalk","createLogger","ChangesWithHash","isEqualHash","log","name","Conflicts","Map","getConflicts","localChanges","gadgetChanges","conflicts","filepath","localChange","gadgetChange","get","type","targetHash","set","keys","startsWith","delete","withoutConflictingChanges","changes","changesWithoutConflicts","has","printConflicts","message","created","greenBright","updated","blueBright","deleted","redBright","printTable","colAligns","headers","spaceY","rows","Array","from","entries","sort","a","b","localeCompare","map","path","Error"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/filesync/conflicts.ts"],"sourcesContent":["import chalk from \"chalk\";\nimport type { Context } from \"../command/context.js\";\nimport { ChangesWithHash, isEqualHash, type ChangeWithHash } from \"./hashes.js\";\n\n/**\n * A map of conflicting changes made between the user's local filesystem\n * and Gadget's filesystem where the key is the path of the conflicting\n * file and the value is an object containing the conflicting changes.\n */\nexport class Conflicts extends Map<string, { localChange: ChangeWithHash; gadgetChange: ChangeWithHash }> {}\n\n/**\n * Returns the conflicting changes between the user's local filesystem\n * and Gadget's filesystem.\n */\nexport const getConflicts = ({\n  localChanges,\n  gadgetChanges,\n}: {\n  localChanges: ChangesWithHash;\n  gadgetChanges: ChangesWithHash;\n}): Conflicts => {\n  const conflicts = new Conflicts();\n\n  for (const [filepath, localChange] of localChanges) {\n    const gadgetChange = gadgetChanges.get(filepath);\n    if (!gadgetChange) {\n      // gadget doesn't have this change, so there's no conflict\n      continue;\n    }\n\n    if (localChange.type === \"delete\" && gadgetChange.type === \"delete\") {\n      // local and gadget both deleted the same file\n      continue;\n    }\n\n    if (\n      \"targetHash\" in localChange &&\n      \"targetHash\" in gadgetChange &&\n      isEqualHash(filepath, localChange.targetHash, gadgetChange.targetHash)\n    ) {\n      // local and gadget both created/updated the same file with the same content\n      continue;\n    }\n\n    // local and gadget both updated the same file with different\n    // content or one updated and the other deleted\n    conflicts.set(filepath, { localChange, gadgetChange });\n  }\n\n  // ignore .gadget/ file conflicts and always use gadget's version\n  // since gadget is the source of truth for .gadget/ files\n  for (const filepath of conflicts.keys()) {\n    if (filepath.startsWith(\".gadget/\")) {\n      conflicts.delete(filepath);\n    }\n  }\n\n  return conflicts;\n};\n\n/**\n * Returns a new `Changes` object that contains only the changes that do\n * not have conflicts.\n *\n * @param options - The options to use.\n * @param options.conflicts - The conflicts to check against.\n * @param options.changes - The changes to filter.\n * @returns A new {@linkcode Changes} object without conflicts.\n */\nexport const withoutConflictingChanges = ({ conflicts, changes }: { conflicts: Conflicts; changes: ChangesWithHash }): ChangesWithHash => {\n  const changesWithoutConflicts = new ChangesWithHash(changes);\n\n  for (const [filepath] of changesWithoutConflicts) {\n    if (conflicts.has(filepath)) {\n      changesWithoutConflicts.delete(filepath);\n    }\n  }\n\n  return changesWithoutConflicts;\n};\n\n/**\n * Prints a table of conflicts between local changes and gadget changes.\n *\n * @param ctx - The current context.\n * @param options - The options to use.\n * @param options.message - The message to print above the table.\n * @param options.conflicts - The conflicts to print.\n */\nexport const printConflicts = (ctx: Context, { message, conflicts }: { message: string; conflicts: Conflicts }): void => {\n  const created = chalk.greenBright(\"+ created\");\n  const updated = chalk.blueBright(\"± updated\");\n  const deleted = chalk.redBright(\"- deleted\");\n\n  ctx.log.printTable({\n    message,\n    colAligns: [\"left\", \"center\", \"center\"],\n    headers: [\"\", \"You\", \"Gadget\"],\n    spaceY: 1,\n    rows: Array.from(conflicts.entries())\n      .sort((a, b) => a[0].localeCompare(b[0]))\n      .map(([path, { localChange, gadgetChange }]) => {\n        switch (true) {\n          case localChange.type === \"create\" && gadgetChange.type === \"create\":\n            return [path, created, created];\n          case localChange.type === \"create\" && gadgetChange.type === \"update\":\n            return [path, created, updated];\n          case localChange.type === \"create\" && gadgetChange.type === \"delete\":\n            return [path, created, deleted];\n          case localChange.type === \"update\" && gadgetChange.type === \"create\":\n            return [path, updated, created];\n          case localChange.type === \"update\" && gadgetChange.type === \"update\":\n            return [path, updated, updated];\n          case localChange.type === \"update\" && gadgetChange.type === \"delete\":\n            return [path, updated, deleted];\n          case localChange.type === \"delete\" && gadgetChange.type === \"create\":\n            return [path, deleted, created];\n          case localChange.type === \"delete\" && gadgetChange.type === \"update\":\n            return [path, deleted, updated];\n          default:\n            throw new Error(`Unexpected conflict: ${localChange.type} vs ${gadgetChange.type}`);\n        }\n      }),\n  });\n};\n"],"names":["chalk","ChangesWithHash","isEqualHash","Conflicts","Map","getConflicts","localChanges","gadgetChanges","conflicts","filepath","localChange","gadgetChange","get","type","targetHash","set","keys","startsWith","delete","withoutConflictingChanges","changes","changesWithoutConflicts","has","printConflicts","ctx","message","created","greenBright","updated","blueBright","deleted","redBright","log","printTable","colAligns","headers","spaceY","rows","Array","from","entries","sort","a","b","localeCompare","map","path","Error"],"mappings":"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"}

package/lib/services/filesync/directory.js

@@ -59,7 +59,7 @@ import normalizePath from "normalize-path";
    * Returns the absolute path by resolving the given path segments
    * relative to the directory path.
    *
-   * @param pathSegments The path segments to resolve.
+   * @param pathSegments - The path segments to resolve.
    * @returns The absolute path.
    */ absolute(...pathSegments) {
         const result = path.resolve(this.path, ...pathSegments);
@@ -195,7 +195,7 @@ import normalizePath from "normalize-path";
  * Calculates the {@linkcode Hash} of the file or directory at the
  * specified absolute path.
  *
- * @param absolutePath The absolute path to the file or directory.
+ * @param absolutePath - The absolute path to the file or directory.
  * @returns A Promise that resolves to the {@linkcode Hash} of the file
  * or directory.
  */ const hash = async (absolutePath)=>{

package/lib/services/filesync/directory.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/filesync/directory.ts"],"sourcesContent":["/**\n * DO NOT MODIFY\n *\n * Everything in this file also exists in ggt to ensure that this logic\n * is the same between the two projects.\n */\nimport fs from \"fs-extra\";\nimport type { Ignore } from \"ignore\";\nimport ignore from \"ignore\";\nimport assert from \"node:assert\";\nimport { createHash } from \"node:crypto\";\nimport path from \"node:path\";\nimport { Transform } from \"node:stream\";\nimport { pipeline } from \"node:stream/promises\";\nimport normalizePath from \"normalize-path\";\n\n/**\n * Paths that are always ignored, regardless of the contents of the `.ignore` file.\n */\nexport const ALWAYS_IGNORE_PATHS = [\".DS_Store\", \"node_modules\", \".git\"] as const;\n\n/**\n * Paths that are ignored when hashing the directory.\n *\n * NOTE: This is the _only_ thing that is allowed to be different between gadget and ggt.\n */\nexport const HASHING_IGNORE_PATHS = [\".gadget/sync.json\", \".gadget/backup\", \"yarn-error.log\"] as const;\n\n/**\n * Represents a directory that is being synced.\n */\nexport class Directory {\n  /**\n   * A gitignore-style file parser used to determine which files to\n   * ignore while syncing.\n   *\n   * @see https://www.npmjs.com/package/ignore\n   */\n  private _ignorer!: Ignore;\n\n  /**\n   * Whether the directory is currently being hashed.\n   */\n  private _isHashing = false;\n\n  private constructor(\n    /**\n     * An absolute path to the directory that is being synced.\n     */\n    readonly path: string,\n  ) {}\n\n  /**\n   * Initializes a directory to be synced.\n   *\n   * If the directory does not exist, it is created.\n   *\n   * @param dir - The directory to initialize.\n   * @returns A Promise that resolves to a Directory instance.\n   */\n  static async init(dir: string): Promise<Directory> {\n    const directory = new Directory(dir);\n    await directory.loadIgnoreFile();\n    return directory;\n  }\n\n  /**\n   * Returns the relative path from this directory to the specified path.\n   *\n   * @param to - The path to which the relative path is calculated.\n   * @returns The relative path from this directory to the specified path.\n   */\n  relative(to: string): string {\n    if (!path.isAbsolute(to)) {\n      // the filepath is already relative\n      return to;\n    }\n\n    return path.relative(this.path, to);\n  }\n\n  /**\n   * Returns the absolute path by resolving the given path segments\n   * relative to the directory path.\n   *\n   * @param pathSegments The path segments to resolve.\n   * @returns The absolute path.\n   */\n  absolute(...pathSegments: string[]): string {\n    const result = path.resolve(this.path, ...pathSegments);\n    assert(result.startsWith(this.path), `expected ${result} to be within ${this.path}`);\n    return result;\n  }\n\n  /**\n   * Similar to {@linkcode relative} in that it converts an absolute\n   * path into a relative one from {@linkcode path}. However, it also\n   * changes any slashes to be posix/unix-like forward slashes,\n   * condenses repeated slashes into a single slash, and adds a trailing\n   * slash if the path is a directory.\n   *\n   * This is used when sending files to Gadget to ensure that the paths\n   * are consistent across platforms.\n   *\n   * @see https://www.npmjs.com/package/normalize-path\n   */\n  normalize(filepath: string, isDirectory: boolean): string {\n    if (path.isAbsolute(filepath)) {\n      filepath = this.relative(filepath);\n    }\n\n    // true = trim trailing slashes\n    filepath = normalizePath(filepath, true);\n\n    if (isDirectory) {\n      filepath += \"/\";\n    }\n\n    return filepath;\n  }\n\n  /**\n   * Loads the `.ignore` file in the directory. If the file does not\n   * exist, it is silently ignored.\n   */\n  async loadIgnoreFile(): Promise<void> {\n    this._ignorer = ignore.default();\n    this._ignorer.add(ALWAYS_IGNORE_PATHS);\n\n    try {\n      const content = await fs.readFile(this.absolute(\".ignore\"), \"utf8\");\n      this._ignorer.add(content);\n    } catch (error) {\n      swallowEnoent(error);\n    }\n  }\n\n  /**\n   * Determines if a file should be ignored based on its filepath.\n   *\n   * @param filepath - The filepath of the file to check.\n   * @returns True if the file should be ignored, false otherwise.\n   */\n  ignores(filepath: string): boolean {\n    filepath = this.relative(filepath);\n    if (filepath === \"\") {\n      // don't ignore the root dir\n      return false;\n    }\n\n    if (filepath.startsWith(\"..\")) {\n      // anything above the root dir is ignored\n      return true;\n    }\n\n    // false = don't trim trailing slashes\n    filepath = normalizePath(filepath, false);\n    if (this._isHashing && HASHING_IGNORE_PATHS.some((ignored) => filepath.startsWith(ignored))) {\n      // special case for hashing\n      return true;\n    }\n\n    return this._ignorer.ignores(filepath);\n  }\n\n  /**\n   * Recursively walks through the directory and yields all non-ignored\n   * files and directories within it.\n   *\n   * @yields - The normalized path of each file and directory.\n   */\n  async *walk({ dir = this.path } = {}): AsyncGenerator<string> {\n    // don't yield the root directory\n    if (dir !== this.path) {\n      yield this.normalize(dir, true);\n    }\n\n    for await (const entry of await fs.opendir(dir)) {\n      const filepath = path.join(dir, entry.name);\n      if (this.ignores(filepath)) {\n        continue;\n      }\n\n      if (entry.isDirectory()) {\n        yield* this.walk({ dir: filepath });\n      } else if (entry.isFile()) {\n        yield this.normalize(filepath, false);\n      }\n    }\n  }\n\n  /**\n   * Calculates the hash of each file and directory and returns an\n   * object containing the hashes keyed by the normalized file path.\n   *\n   * @returns A Promise that resolves to an object containing the hashes\n   * of each file.\n   */\n  async hashes(): Promise<Hashes> {\n    try {\n      this._isHashing = true;\n      const files = {} as Hashes;\n\n      for await (const normalizedPath of this.walk()) {\n        const absolutePath = this.absolute(normalizedPath);\n        files[normalizedPath] = await hash(absolutePath);\n      }\n\n      return files;\n    } finally {\n      this._isHashing = false;\n    }\n  }\n}\n\n/**\n * Key/value pairs where the key is the normalized path and the value is\n * the result of {@linkcode hash} for that path.\n */\nexport type Hashes = Record<string, Hash>;\n\nexport type Hash = {\n  /**\n   * The SHA-1 hash of the file or directory.\n   *\n   * If the path points to a directory, the hash is calculated based on\n   * the directory's basename. If the path points to a file, the hash is\n   * calculated based on the file's basename and contents.\n   */\n  sha1: string;\n\n  /**\n   * The Unix-style file permissions of the file or directory, or\n   * undefined if the platform that generated this hash doesn't support\n   * them.\n   *\n   * @example 0o644\n   * @see supportsPermissions\n   */\n  permissions?: number;\n};\n\n/**\n * Whether the current platform supports Unix-style file permissions.\n *\n * Windows doesn't support Unix-style file permissions and all file\n * permissions retrieved via `node:fs` on Windows are translated to 666\n * or 444.\n */\nexport const supportsPermissions = process.platform === \"linux\" || process.platform === \"darwin\";\n\n/**\n * Calculates the {@linkcode Hash} of the file or directory at the\n * specified absolute path.\n *\n * @param absolutePath The absolute path to the file or directory.\n * @returns A Promise that resolves to the {@linkcode Hash} of the file\n * or directory.\n */\nconst hash = async (absolutePath: string): Promise<Hash> => {\n  const sha1 = createHash(\"sha1\");\n  sha1.update(path.basename(absolutePath));\n\n  const stats = await fs.stat(absolutePath);\n\n  let permissions;\n  if (supportsPermissions) {\n    // strip everything but the permissions\n    permissions = stats.mode & 0o777;\n  }\n\n  if (stats.isDirectory()) {\n    return { sha1: sha1.digest(\"hex\"), permissions };\n  }\n\n  // windows uses CRLF line endings whereas unix uses LF line endings so\n  // we always strip out CR bytes (0x0d) when hashing files. this does\n  // make us blind to files that only differ by CR bytes, but that's a\n  // tradeoff we're willing to make.\n  const removeCR = new Transform({\n    transform(chunk: Buffer, _encoding, callback) {\n      if (!chunk.includes(0x0d)) {\n        callback(undefined, chunk);\n        return;\n      }\n\n      const filteredChunk = Buffer.alloc(chunk.length);\n      let i = 0;\n      for (const byte of chunk) {\n        if (byte !== 0x0d) {\n          filteredChunk[i++] = byte;\n        }\n      }\n\n      callback(undefined, filteredChunk.slice(0, i));\n    },\n  });\n\n  await pipeline(fs.createReadStream(absolutePath), removeCR, sha1);\n\n  return { sha1: sha1.digest(\"hex\"), permissions };\n};\n\n/**\n * Swallows ENOENT errors and throws any other errors.\n *\n * @param error - The error to handle.\n * @throws The original error if it is not an ENOENT error.\n */\nexport const swallowEnoent = (error: unknown): void => {\n  if (error && typeof error === \"object\" && \"code\" in error && error.code === \"ENOENT\") {\n    return;\n  }\n  throw error;\n};\n"],"names":["fs","ignore","assert","createHash","path","Transform","pipeline","normalizePath","ALWAYS_IGNORE_PATHS","HASHING_IGNORE_PATHS","Directory","init","dir","directory","loadIgnoreFile","relative","to","isAbsolute","absolute","pathSegments","result","resolve","startsWith","normalize","filepath","isDirectory","_ignorer","default","add","content","readFile","error","swallowEnoent","ignores","_isHashing","some","ignored","walk","entry","opendir","join","name","isFile","hashes","files","normalizedPath","absolutePath","hash","supportsPermissions","process","platform","sha1","update","basename","stats","stat","permissions","mode","digest","removeCR","transform","chunk","_encoding","callback","includes","undefined","filteredChunk","Buffer","alloc","length","i","byte","slice","createReadStream","code"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/filesync/directory.ts"],"sourcesContent":["/**\n * DO NOT MODIFY\n *\n * Everything in this file also exists in ggt to ensure that this logic\n * is the same between the two projects.\n */\nimport fs from \"fs-extra\";\nimport type { Ignore } from \"ignore\";\nimport ignore from \"ignore\";\nimport assert from \"node:assert\";\nimport { createHash } from \"node:crypto\";\nimport path from \"node:path\";\nimport { Transform } from \"node:stream\";\nimport { pipeline } from \"node:stream/promises\";\nimport normalizePath from \"normalize-path\";\n\n/**\n * Paths that are always ignored, regardless of the contents of the `.ignore` file.\n */\nexport const ALWAYS_IGNORE_PATHS = [\".DS_Store\", \"node_modules\", \".git\"] as const;\n\n/**\n * Paths that are ignored when hashing the directory.\n *\n * NOTE: This is the _only_ thing that is allowed to be different between gadget and ggt.\n */\nexport const HASHING_IGNORE_PATHS = [\".gadget/sync.json\", \".gadget/backup\", \"yarn-error.log\"] as const;\n\n/**\n * Represents a directory that is being synced.\n */\nexport class Directory {\n  /**\n   * A gitignore-style file parser used to determine which files to\n   * ignore while syncing.\n   *\n   * @see https://www.npmjs.com/package/ignore\n   */\n  private _ignorer!: Ignore;\n\n  /**\n   * Whether the directory is currently being hashed.\n   */\n  private _isHashing = false;\n\n  private constructor(\n    /**\n     * An absolute path to the directory that is being synced.\n     */\n    readonly path: string,\n  ) {}\n\n  /**\n   * Initializes a directory to be synced.\n   *\n   * If the directory does not exist, it is created.\n   *\n   * @param dir - The directory to initialize.\n   * @returns A Promise that resolves to a Directory instance.\n   */\n  static async init(dir: string): Promise<Directory> {\n    const directory = new Directory(dir);\n    await directory.loadIgnoreFile();\n    return directory;\n  }\n\n  /**\n   * Returns the relative path from this directory to the specified path.\n   *\n   * @param to - The path to which the relative path is calculated.\n   * @returns The relative path from this directory to the specified path.\n   */\n  relative(to: string): string {\n    if (!path.isAbsolute(to)) {\n      // the filepath is already relative\n      return to;\n    }\n\n    return path.relative(this.path, to);\n  }\n\n  /**\n   * Returns the absolute path by resolving the given path segments\n   * relative to the directory path.\n   *\n   * @param pathSegments - The path segments to resolve.\n   * @returns The absolute path.\n   */\n  absolute(...pathSegments: string[]): string {\n    const result = path.resolve(this.path, ...pathSegments);\n    assert(result.startsWith(this.path), `expected ${result} to be within ${this.path}`);\n    return result;\n  }\n\n  /**\n   * Similar to {@linkcode relative} in that it converts an absolute\n   * path into a relative one from {@linkcode path}. However, it also\n   * changes any slashes to be posix/unix-like forward slashes,\n   * condenses repeated slashes into a single slash, and adds a trailing\n   * slash if the path is a directory.\n   *\n   * This is used when sending files to Gadget to ensure that the paths\n   * are consistent across platforms.\n   *\n   * @see https://www.npmjs.com/package/normalize-path\n   */\n  normalize(filepath: string, isDirectory: boolean): string {\n    if (path.isAbsolute(filepath)) {\n      filepath = this.relative(filepath);\n    }\n\n    // true = trim trailing slashes\n    filepath = normalizePath(filepath, true);\n\n    if (isDirectory) {\n      filepath += \"/\";\n    }\n\n    return filepath;\n  }\n\n  /**\n   * Loads the `.ignore` file in the directory. If the file does not\n   * exist, it is silently ignored.\n   */\n  async loadIgnoreFile(): Promise<void> {\n    this._ignorer = ignore.default();\n    this._ignorer.add(ALWAYS_IGNORE_PATHS);\n\n    try {\n      const content = await fs.readFile(this.absolute(\".ignore\"), \"utf8\");\n      this._ignorer.add(content);\n    } catch (error) {\n      swallowEnoent(error);\n    }\n  }\n\n  /**\n   * Determines if a file should be ignored based on its filepath.\n   *\n   * @param filepath - The filepath of the file to check.\n   * @returns True if the file should be ignored, false otherwise.\n   */\n  ignores(filepath: string): boolean {\n    filepath = this.relative(filepath);\n    if (filepath === \"\") {\n      // don't ignore the root dir\n      return false;\n    }\n\n    if (filepath.startsWith(\"..\")) {\n      // anything above the root dir is ignored\n      return true;\n    }\n\n    // false = don't trim trailing slashes\n    filepath = normalizePath(filepath, false);\n    if (this._isHashing && HASHING_IGNORE_PATHS.some((ignored) => filepath.startsWith(ignored))) {\n      // special case for hashing\n      return true;\n    }\n\n    return this._ignorer.ignores(filepath);\n  }\n\n  /**\n   * Recursively walks through the directory and yields all non-ignored\n   * files and directories within it.\n   *\n   * @yields - The normalized path of each file and directory.\n   */\n  async *walk({ dir = this.path } = {}): AsyncGenerator<string> {\n    // don't yield the root directory\n    if (dir !== this.path) {\n      yield this.normalize(dir, true);\n    }\n\n    for await (const entry of await fs.opendir(dir)) {\n      const filepath = path.join(dir, entry.name);\n      if (this.ignores(filepath)) {\n        continue;\n      }\n\n      if (entry.isDirectory()) {\n        yield* this.walk({ dir: filepath });\n      } else if (entry.isFile()) {\n        yield this.normalize(filepath, false);\n      }\n    }\n  }\n\n  /**\n   * Calculates the hash of each file and directory and returns an\n   * object containing the hashes keyed by the normalized file path.\n   *\n   * @returns A Promise that resolves to an object containing the hashes\n   * of each file.\n   */\n  async hashes(): Promise<Hashes> {\n    try {\n      this._isHashing = true;\n      const files = {} as Hashes;\n\n      for await (const normalizedPath of this.walk()) {\n        const absolutePath = this.absolute(normalizedPath);\n        files[normalizedPath] = await hash(absolutePath);\n      }\n\n      return files;\n    } finally {\n      this._isHashing = false;\n    }\n  }\n}\n\n/**\n * Key/value pairs where the key is the normalized path and the value is\n * the result of {@linkcode hash} for that path.\n */\nexport type Hashes = Record<string, Hash>;\n\nexport type Hash = {\n  /**\n   * The SHA-1 hash of the file or directory.\n   *\n   * If the path points to a directory, the hash is calculated based on\n   * the directory's basename. If the path points to a file, the hash is\n   * calculated based on the file's basename and contents.\n   */\n  sha1: string;\n\n  /**\n   * The Unix-style file permissions of the file or directory, or\n   * undefined if the platform that generated this hash doesn't support\n   * them.\n   *\n   * @example 0o644\n   * @see supportsPermissions\n   */\n  permissions?: number;\n};\n\n/**\n * Whether the current platform supports Unix-style file permissions.\n *\n * Windows doesn't support Unix-style file permissions and all file\n * permissions retrieved via `node:fs` on Windows are translated to 666\n * or 444.\n */\nexport const supportsPermissions = process.platform === \"linux\" || process.platform === \"darwin\";\n\n/**\n * Calculates the {@linkcode Hash} of the file or directory at the\n * specified absolute path.\n *\n * @param absolutePath - The absolute path to the file or directory.\n * @returns A Promise that resolves to the {@linkcode Hash} of the file\n * or directory.\n */\nconst hash = async (absolutePath: string): Promise<Hash> => {\n  const sha1 = createHash(\"sha1\");\n  sha1.update(path.basename(absolutePath));\n\n  const stats = await fs.stat(absolutePath);\n\n  let permissions;\n  if (supportsPermissions) {\n    // strip everything but the permissions\n    permissions = stats.mode & 0o777;\n  }\n\n  if (stats.isDirectory()) {\n    return { sha1: sha1.digest(\"hex\"), permissions };\n  }\n\n  // windows uses CRLF line endings whereas unix uses LF line endings so\n  // we always strip out CR bytes (0x0d) when hashing files. this does\n  // make us blind to files that only differ by CR bytes, but that's a\n  // tradeoff we're willing to make.\n  const removeCR = new Transform({\n    transform(chunk: Buffer, _encoding, callback) {\n      if (!chunk.includes(0x0d)) {\n        callback(undefined, chunk);\n        return;\n      }\n\n      const filteredChunk = Buffer.alloc(chunk.length);\n      let i = 0;\n      for (const byte of chunk) {\n        if (byte !== 0x0d) {\n          filteredChunk[i++] = byte;\n        }\n      }\n\n      callback(undefined, filteredChunk.slice(0, i));\n    },\n  });\n\n  await pipeline(fs.createReadStream(absolutePath), removeCR, sha1);\n\n  return { sha1: sha1.digest(\"hex\"), permissions };\n};\n\n/**\n * Swallows ENOENT errors and throws any other errors.\n *\n * @param error - The error to handle.\n * @throws The original error if it is not an ENOENT error.\n */\nexport const swallowEnoent = (error: unknown): void => {\n  if (error && typeof error === \"object\" && \"code\" in error && error.code === \"ENOENT\") {\n    return;\n  }\n  throw error;\n};\n"],"names":["fs","ignore","assert","createHash","path","Transform","pipeline","normalizePath","ALWAYS_IGNORE_PATHS","HASHING_IGNORE_PATHS","Directory","init","dir","directory","loadIgnoreFile","relative","to","isAbsolute","absolute","pathSegments","result","resolve","startsWith","normalize","filepath","isDirectory","_ignorer","default","add","content","readFile","error","swallowEnoent","ignores","_isHashing","some","ignored","walk","entry","opendir","join","name","isFile","hashes","files","normalizedPath","absolutePath","hash","supportsPermissions","process","platform","sha1","update","basename","stats","stat","permissions","mode","digest","removeCR","transform","chunk","_encoding","callback","includes","undefined","filteredChunk","Buffer","alloc","length","i","byte","slice","createReadStream","code"],"mappings":"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"}

package/lib/services/filesync/filesync.js

@@ -1,5 +1,6 @@
 import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import dayjs from "dayjs";
+import { execa } from "execa";
 import { findUp } from "find-up";
 import fs from "fs-extra";
 import ms from "ms";
@@ -13,11 +14,14 @@ import { z } from "zod";
 import { FileSyncEncoding } from "../../__generated__/graphql.js";
 import { getApps } from "../app/app.js";
 import { AppArg } from "../app/arg.js";
-import { EditGraphQL, EditGraphQLError, FILE_SYNC_COMPARISON_HASHES_QUERY, FILE_SYNC_FILES_QUERY, FILE_SYNC_HASHES_QUERY, PUBLISH_FILE_SYNC_EVENTS_MUTATION, REMOTE_FILE_SYNC_EVENTS_SUBSCRIPTION } from "../app/edit-graphql.js";
+import { Edit } from "../app/edit/edit.js";
+import { EditError } from "../app/edit/error.js";
+import { FILE_SYNC_COMPARISON_HASHES_QUERY, FILE_SYNC_FILES_QUERY, FILE_SYNC_HASHES_QUERY, PUBLISH_FILE_SYNC_EVENTS_MUTATION, REMOTE_FILE_SYNC_EVENTS_SUBSCRIPTION } from "../app/edit/operation.js";
 import { ArgError } from "../command/arg.js";
 import { config, homePath } from "../config/config.js";
 import { select } from "../output/prompt.js";
 import { sprint } from "../output/sprint.js";
+import { getUserOrLogin } from "../user/user.js";
 import { sortBySimilar } from "../util/collection.js";
 import { noop } from "../util/function.js";
 import { isGraphQLErrors, isGraphQLResult, isObject, isString } from "../util/is.js";
@@ -33,7 +37,7 @@ export class FileSync {
    * This determines if the filesystem in Gadget is ahead of the
    * filesystem on the local machine.
    */ get filesVersion() {
-        return BigInt(this._state.filesVersion);
+        return BigInt(this._syncJson.filesVersion);
     }
     /**
    * The largest mtime that was seen on the filesystem.
@@ -41,7 +45,7 @@ export class FileSync {
    * This is used to determine if any files have changed since the last
    * sync. This does not include the mtime of files that are ignored.
    */ get mtime() {
-        return this._state.mtime;
+        return this._syncJson.mtime;
     }
     /**
    * Initializes a {@linkcode FileSync} instance.
@@ -49,11 +53,12 @@ export class FileSync {
    * - Ensures the directory is empty or contains a `.gadget/sync.json` file (unless `options.force` is `true`)
    * - Ensures an app is specified (either via `options.app` or by prompting the user)
    * - Ensures the specified app matches the app the directory was previously synced to (unless `options.force` is `true`)
-   */ static async init({ ctx, user }) {
-        ctx = ctx.clone({
+   */ static async init(ctx) {
+        ctx = ctx.child({
             name: "filesync"
         });
-        const apps = await getApps(user);
+        const user = await getUserOrLogin(ctx);
+        const apps = await getApps(ctx);
         if (apps.length === 0) {
             throw new ArgError(sprint`
           You (${user.email}) don't have have any Gadget applications.
@@ -89,7 +94,7 @@ export class FileSync {
         let appSlug = ctx.args["--app"] || state?.app;
         if (!appSlug) {
             // the user didn't specify an app, suggest some apps that they can sync to
-            appSlug = await select({
+            appSlug = await select(ctx, {
                 message: "Select the app to sync to",
                 choices: apps.map((x)=>x.slug)
             });
@@ -112,6 +117,7 @@ export class FileSync {
 
       `.concat(`  • ${similarAppSlugs.join("\n  • ")}`));
         }
+        ctx.app = app;
         const directory = await Directory.init(dir);
         if (!state) {
             // the .gadget/sync.json file didn't exist or contained invalid json
@@ -166,7 +172,8 @@ export class FileSync {
     /**
    * Sends file changes to the Gadget.
    *
-   * @param changes - The changes to send.
+   * @param options - The options to use.
+   * @param options.changes - The changes to send.
    * @returns A promise that resolves when the changes have been sent.
    */ async sendChangesToGadget({ changes }) {
         await this._syncOperations.add(async ()=>{
@@ -187,10 +194,14 @@ export class FileSync {
    * Subscribes to file changes on Gadget and executes the provided
    * callbacks before and after the changes occur.
    *
+   * @param options - The options to use.
+   * @param options.beforeChanges - A callback that is called before the changes occur.
+   * @param options.afterChanges - A callback that is called after the changes occur.
+   * @param options.onError - A callback that is called if an error occurs.
    * @returns A function that unsubscribes from changes on Gadget.
-   */ subscribeToGadgetChanges({ beforeChanges, afterChanges, onError }) {
-        return this.editGraphQL.subscribe({
-            query: REMOTE_FILE_SYNC_EVENTS_SUBSCRIPTION,
+   */ subscribeToGadgetChanges({ beforeChanges = noop, afterChanges = noop, onError }) {
+        return this.edit.subscribe({
+            subscription: REMOTE_FILE_SYNC_EVENTS_SUBSCRIPTION,
             // the reason this is a function rather than a static value is
             // so that it will be re-evaluated if the connection is lost and
             // then re-established. this ensures that we send our current
@@ -209,7 +220,7 @@ export class FileSync {
                         return;
                     }
                     this.ctx.log.debug("received files", {
-                        remoteFilesVersion: remoteFilesVersion,
+                        remoteFilesVersion,
                         changed: changed.map((change)=>change.path),
                         deleted: deleted.map((change)=>change.path)
                     });
@@ -238,7 +249,7 @@ export class FileSync {
                         delete: deleted.map((file)=>file.path)
                     });
                     if (changes.size > 0) {
-                        printChanges({
+                        printChanges(this.ctx, {
                             message: sprint`← Received {gray ${dayjs().format("hh:mm:ss A")}}`,
                             changes,
                             tense: "past",
@@ -255,8 +266,7 @@ export class FileSync {
     /**
    * Ensures the local filesystem is in sync with Gadget's filesystem.
    * - All non-conflicting changes are automatically merged.
-   * - Conflicts are resolved by prompting the user to either keep their
-   *   local changes or keep Gadget's changes.
+   * - Conflicts are resolved by prompting the user to either keep their local changes or keep Gadget's changes.
    * - This function will not return until the filesystem is in sync.
    */ async sync({ maxAttempts = 10 } = {}) {
         let attempt = 0;
@@ -289,7 +299,7 @@ export class FileSync {
         }
     }
     async _sync({ filesVersionHashes, localHashes, gadgetHashes, gadgetFilesVersion }) {
-        let localChanges = getChanges({
+        let localChanges = getChanges(this.ctx, {
             from: filesVersionHashes,
             to: localHashes,
             existing: gadgetHashes,
@@ -297,14 +307,14 @@ export class FileSync {
                 ".gadget/"
             ]
         });
-        let gadgetChanges = getChanges({
+        let gadgetChanges = getChanges(this.ctx, {
             from: filesVersionHashes,
             to: gadgetHashes,
             existing: localHashes
         });
         if (localChanges.size === 0 && gadgetChanges.size === 0) {
             // the local filesystem is missing .gadget/ files
-            gadgetChanges = getChanges({
+            gadgetChanges = getChanges(this.ctx, {
                 from: localHashes,
                 to: gadgetHashes
             });
@@ -323,11 +333,11 @@ export class FileSync {
             });
             let preference = this.ctx.args["--prefer"];
             if (!preference) {
-                printConflicts({
+                printConflicts(this.ctx, {
                     message: sprint`{bold You have conflicting changes with Gadget}`,
                     conflicts
                 });
-                preference = await select({
+                preference = await select(this.ctx, {
                     message: "How would you like to resolve these conflicts?",
                     choices: Object.values(ConflictPreference)
                 });
@@ -381,7 +391,7 @@ export class FileSync {
                 if (this.filesVersion === 0n) {
                     // this is the first time we're syncing, so just get the
                     // hashes of the latest filesVersion
-                    const { fileSyncHashes } = await this.editGraphQL.query({
+                    const { fileSyncHashes } = await this.edit.query({
                         query: FILE_SYNC_HASHES_QUERY
                     });
                     gadgetFilesVersion = BigInt(fileSyncHashes.filesVersion);
@@ -391,7 +401,7 @@ export class FileSync {
                     // this isn't the first time we're syncing, so get the hashes
                     // of the files at our local filesVersion and the latest
                     // filesVersion
-                    const { fileSyncComparisonHashes } = await this.editGraphQL.query({
+                    const { fileSyncComparisonHashes } = await this.edit.query({
                         query: FILE_SYNC_COMPARISON_HASHES_QUERY,
                         variables: {
                             filesVersion: String(this.filesVersion)
@@ -413,7 +423,7 @@ export class FileSync {
             localHashes,
             gadgetHashes,
             gadgetFilesVersion,
-            inSync: isEqualHashes(localHashes, gadgetHashes)
+            inSync: isEqualHashes(this.ctx, localHashes, gadgetHashes)
         };
     }
     async _getChangesFromGadget({ filesVersion, changes }) {
@@ -425,7 +435,7 @@ export class FileSync {
         const updated = changes.updated();
         let files = [];
         if (created.length > 0 || updated.length > 0) {
-            const { fileSyncFiles } = await this.editGraphQL.query({
+            const { fileSyncFiles } = await this.edit.query({
                 query: FILE_SYNC_FILES_QUERY,
                 variables: {
                     paths: [
@@ -443,7 +453,7 @@ export class FileSync {
             files,
             delete: changes.deleted()
         });
-        printChanges({
+        printChanges(this.ctx, {
             changes,
             tense: "past",
             message: sprint`← Received {gray ${dayjs().format("hh:mm:ss A")}}`
@@ -494,8 +504,8 @@ export class FileSync {
             this.ctx.log.debug("skipping send because there are no changes");
             return;
         }
-        const { publishFileSyncEvents: { remoteFilesVersion } } = await this.editGraphQL.query({
-            query: PUBLISH_FILE_SYNC_EVENTS_MUTATION,
+        const { publishFileSyncEvents: { remoteFilesVersion } } = await this.edit.mutate({
+            mutation: PUBLISH_FILE_SYNC_EVENTS_MUTATION,
             variables: {
                 input: {
                     expectedRemoteFilesVersion: String(expectedFilesVersion),
@@ -520,7 +530,7 @@ export class FileSync {
                 }
             }
         });
-        printChanges({
+        printChanges(this.ctx, {
             changes,
             tense: "past",
             message: sprint`→ Sent {gray ${dayjs().format("hh:mm:ss A")}}`,
@@ -561,7 +571,9 @@ export class FileSync {
                     swallowEnoent(error);
                 }
             }, {
-                retries: 2,
+                // windows tends to run into these issues way more often than
+                // mac/linux, so we retry more times
+                retries: config.windows ? 4 : 2,
                 minTimeout: ms("100ms"),
                 onFailedAttempt: (error)=>{
                     this.ctx.log.warn("failed to move file to backup", {
@@ -595,7 +607,7 @@ export class FileSync {
             }
         });
         await this._save(String(filesVersion));
-        return new Changes([
+        const changes = new Changes([
             ...created.map((path)=>[
                     path,
                     {
@@ -615,19 +627,29 @@ export class FileSync {
                     }
                 ])
         ]);
+        if (changes.has("yarn.lock")) {
+            this.ctx.log.info("running yarn install --check-files");
+            await execa("yarn", [
+                "install",
+                "--check-files"
+            ], {
+                cwd: this.directory.path
+            }).then(()=>this.ctx.log.info("yarn install complete")).catch((error)=>this.ctx.log.error("yarn install failed", {
+                    error
+                }));
+        }
+        return changes;
     }
     /**
-   * Updates {@linkcode _state} and saves it to `.gadget/sync.json`.
+   * Updates {@linkcode _syncJson} and saves it to `.gadget/sync.json`.
    */ async _save(filesVersion) {
-        this._state = {
-            ...this._state,
+        this._syncJson = {
+            ...this._syncJson,
             mtime: Date.now() + 1,
             filesVersion: String(filesVersion)
         };
-        this.ctx.log.debug("saving state", {
-            state: this._state
-        });
-        await fs.outputJSON(this.directory.absolute(".gadget/sync.json"), this._state, {
+        this.ctx.log.debug("saving .gadget/sync.json");
+        await fs.outputJSON(this.directory.absolute(".gadget/sync.json"), this._syncJson, {
             spaces: 2
         });
     }
@@ -642,12 +664,12 @@ export class FileSync {
      * The state of the filesystem.
      *
      * This is persisted to `.gadget/sync.json` within the {@linkcode directory}.
-     */ _state){
+     */ _syncJson){
         _define_property(this, "ctx", void 0);
         _define_property(this, "directory", void 0);
         _define_property(this, "app", void 0);
-        _define_property(this, "_state", void 0);
-        _define_property(this, "editGraphQL", void 0);
+        _define_property(this, "_syncJson", void 0);
+        _define_property(this, "edit", void 0);
         /**
    * A FIFO async callback queue that ensures we process filesync events
    * in the order we receive them.
@@ -655,11 +677,19 @@ export class FileSync {
         this.ctx = ctx;
         this.directory = directory;
         this.app = app;
-        this._state = _state;
+        this._syncJson = _syncJson;
         this._syncOperations = new PQueue({
             concurrency: 1
         });
-        this.editGraphQL = new EditGraphQL(this.app);
+        this.ctx = ctx.child({
+            fields: ()=>({
+                    filesync: {
+                        directory: this.directory.path,
+                        filesVersion: this.filesVersion
+                    }
+                })
+        });
+        this.edit = new Edit(this.ctx);
     }
 }
 /**
@@ -714,7 +744,7 @@ export const FileSyncArgs = {
     "--force": Boolean
 };
 export const isFilesVersionMismatchError = (error)=>{
-    if (error instanceof EditGraphQLError) {
+    if (error instanceof EditError) {
         error = error.cause;
     }
     if (isGraphQLResult(error)) {