#6902

See discussion under #6902.
Add genaiscript for commit messages for future use.

genaisrc/gcm.genai.mts

@@ -0,0 +1,81 @@
+import { select, input, confirm } from "@inquirer/prompts"
+
+// Check for staged changes and stage all changes if none are staged
+let diff = await host.exec("git", ["diff", "--cached"])
+if (!diff.stdout) {
+    const stage = await confirm({
+        message: "No staged changes. Stage all changes?",
+        default: true,
+    })
+    if (stage) {
+        await host.exec("git", ["add", "."])
+        diff = await host.exec("git", [
+            "diff",
+            "--cached",
+            "--",
+            ".",
+            ":!**/genaiscript.d.ts",
+        ])
+    }
+    if (!diff.stdout) cancel("no staged changes")
+}
+
+console.log(diff.stdout)
+
+let choice
+let message
+do {
+    // Generate commit message
+    message = (
+        await runPrompt(
+            (_) => {
+                _.def("GIT_DIFF", diff, { maxTokens: 20000 })
+                _.$`GIT_DIFF is a diff of all staged changes, coming from the command:
+\`\`\`
+git diff --cached
+\`\`\`
+Please generate a concise, one-line commit message for these changes.
+- do NOT add quotes`
+            },
+            { cache: false, temperature: 0.8 }
+        )
+    ).text
+
+    // Prompt user for commit message
+    choice = await select({
+        message,
+        choices: [
+            {
+                name: "commit",
+                value: "commit",
+                description: "accept message and commit",
+            },
+            {
+                name: "edit",
+                value: "edit",
+                description: "edit message and commit",
+            },
+            {
+                name: "regenerate",
+                value: "regenerate",
+                description: "regenerate message",
+            },
+        ],
+    })
+
+    // Handle user choice
+    if (choice === "edit") {
+        message = await input({
+            message: "Edit commit message",
+            required: true,
+        })
+        choice = "commit"
+    }
+    // Regenerate message
+    if (choice === "commit" && message) {
+        console.log((await host.exec("git", ["commit", "-m", message])).stdout)
+        if (await confirm({ message: "Push changes?", default: true }))
+            console.log((await host.exec("git", ["push"])).stdout)
+        break
+    }
+} while (choice !== "commit")

src/util/memory_manager.cpp

@@ -29,6 +29,8 @@ Copyright (c) 2015 Microsoft Corporation
 # define malloc_usable_size _msize
 #endif
 
+#define SIZE_T_ALIGN 2
+
 // The following two function are automatically generated by the mk_make.py script.
 // The script collects ADD_INITIALIZER and ADD_FINALIZER commands in the .h files.
 // For example, rational.h contains
@@ -278,7 +280,7 @@ void memory::deallocate(void * p) {
     size_t sz      = malloc_usable_size(p);
     void * real_p  = p;
 #else
-    size_t * sz_p  = reinterpret_cast<size_t*>(p) - 1;
+    size_t * sz_p  = reinterpret_cast<size_t*>(p) - SIZE_T_ALIGN;
     size_t sz      = *sz_p;
     void * real_p  = reinterpret_cast<void*>(sz_p);
 #endif
@@ -291,7 +293,7 @@ void memory::deallocate(void * p) {
 
 void * memory::allocate(size_t s) {
 #ifndef HAS_MALLOC_USABLE_SIZE
-    s = s + sizeof(size_t); // we allocate an extra field!
+    s = s + SIZE_T_ALIGN * sizeof(size_t); // we allocate an extra field!
 #endif
     g_memory_thread_alloc_size += s;
     g_memory_thread_alloc_count += 1;
@@ -308,7 +310,7 @@ void * memory::allocate(size_t s) {
     return r;
 #else
     *(static_cast<size_t*>(r)) = s;
-    return static_cast<size_t*>(r) + 1; // we return a pointer to the location after the extra field
+    return static_cast<size_t*>(r) + SIZE_T_ALIGN; // we return a pointer to the location after the extra field
 #endif
 }
 
@@ -323,7 +325,7 @@ void* memory::reallocate(void *p, size_t s) {
     size_t *sz_p = reinterpret_cast<size_t*>(p)-1;
     size_t sz = *sz_p;
     void *real_p = reinterpret_cast<void*>(sz_p);
-    s = s + sizeof(size_t); // we allocate an extra field!
+    s = s + SIZE_T_ALIGN * sizeof(size_t); // we allocate an extra field!
 #endif
     g_memory_thread_alloc_size += s - sz;
     g_memory_thread_alloc_count += 1;
@@ -341,7 +343,7 @@ void* memory::reallocate(void *p, size_t s) {
     return r;
 #else
     *(static_cast<size_t*>(r)) = s;
-    return static_cast<size_t*>(r) + 1; // we return a pointer to the location after the extra field
+    return static_cast<size_t*>(r) + SIZE_T_ALIGN; // we return a pointer to the location after the extra field
 #endif
 }
 
@@ -358,7 +360,7 @@ void memory::deallocate(void * p) {
     size_t sz      = malloc_usable_size(p);
     void * real_p  = p;
 #else
-    size_t * sz_p  = reinterpret_cast<size_t*>(p) - 1;
+    size_t * sz_p  = reinterpret_cast<size_t*>(p) - SIZE_T_ALIGN;
     size_t sz      = *sz_p;
     void * real_p  = reinterpret_cast<void*>(sz_p);
 #endif
@@ -368,7 +370,7 @@ void memory::deallocate(void * p) {
 
 void * memory::allocate(size_t s) {
 #ifndef HAS_MALLOC_USABLE_SIZE
-    s = s + sizeof(size_t); // we allocate an extra field!
+    s = s + SIZE_T_ALIGN * sizeof(size_t); // we allocate an extra field!
 #endif
     g_memory_alloc_size += s;
     g_memory_alloc_count += 1;
@@ -389,7 +391,7 @@ void * memory::allocate(size_t s) {
     return r;
 #else
     *(static_cast<size_t*>(r)) = s;
-    return static_cast<size_t*>(r) + 1; // we return a pointer to the location after the extra field
+    return static_cast<size_t*>(r) + SIZE_T_ALIGN; // we return a pointer to the location after the extra field
 #endif
 }
 
@@ -401,10 +403,10 @@ void* memory::reallocate(void *p, size_t s) {
     if (sz >= s)
         return p;
 #else
-    size_t * sz_p  = reinterpret_cast<size_t*>(p) - 1;
+    size_t * sz_p  = reinterpret_cast<size_t*>(p) - SIZE_T_ALIGN;
     size_t sz      = *sz_p;
     void * real_p  = reinterpret_cast<void*>(sz_p);
-    s = s + sizeof(size_t); // we allocate an extra field!
+    s = s + SIZE_T_ALIGN * sizeof(size_t); // we allocate an extra field!
 #endif
     g_memory_alloc_size += s - sz;
     g_memory_alloc_count += 1;
@@ -425,7 +427,7 @@ void* memory::reallocate(void *p, size_t s) {
     return r;
 #else
     *(static_cast<size_t*>(r)) = s;
-    return static_cast<size_t*>(r) + 1; // we return a pointer to the location after the extra field
+    return static_cast<size_t*>(r) + SIZE_T_ALIGN; // we return a pointer to the location after the extra field
 #endif
 }